Merge branch 'master' into dev

* master: typo udpated format Changelog changelog Bump version Fix bug in uploading of measurements
ooni · Feb 1, 2019 · 0421c80 · 0421c80
2 parents 8da81db + 09b33b6
commit 0421c80
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,20 @@
+# OONI Probe Android 2.0.1+42 [2019-02-01]
+
+Fixes:
+
+* Bug in measurement upload: https://github.com/ooni/probe-android/issues/188
+
+# OONI Probe Android 2.0.0+41 [2019-01-13]
+
+New features:
+
+* This new version includes a major UI overhaul.
+* An overview screen for all test results
+* Enhanced website testing: you can test a website of your choice, pick categories of sites to test and test country-specific lists
+* Data usage tracking on a test by test basis
+--
+measurement-kit version: android-libs: 0.9.1-android.1
+
 # ooniprobe-android 1.2.3+17 [2017-10-08]
 
 New features:

diff --git a/app/build.gradle b/app/build.gradle
@@ -63,4 +63,4 @@ dependencies {
 	implementation 'commons-io:commons-io:2.6'
 }
 
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'