summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-09-26 13:04:11 +0200
committerParménides GV <parmegv@sdf.org>2014-09-26 13:04:11 +0200
commit22b7ee4614a2f47d55496de8a9b55040c0f4ba85 (patch)
tree101d4fb8e347bd040ad963248611fd1684a12cd9
parent8c4b3edafc68e647bd44ae456c15f0aea9d45905 (diff)
parentb2b6a2c462dfd318f28ff8e6767bf9fb6eabe2ad (diff)
Merge branch 'release-0.7.0' into develop
-rw-r--r--CHANGELOG8
-rw-r--r--app/src/main/AndroidManifest.xml4
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index caf1fe5d..9ba29e66 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+0.7.0 September 26 2014 - the "quick" release
+Features
+- Restart quickly if killed
+- F-Droid ready
+Bugs Fixed
+- Vpn can be turned off with the Off switch
+- "Blocked" notification not shown if Vpn is ff
+
0.6.0 August 18 2014 - the "persistent" release
Features
- Improved security:
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1fb6ad73..423293b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="se.leap.bitmaskclient"
- android:versionCode="91"
- android:versionName="0.6.0" >
+ android:versionCode="93"
+ android:versionName="0.7.0" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />