Merge branch 'V2.5' into V2.6

2017-12-07 05:59:26 +00:00
parent 37f759fa5d ef1c73905b
commit ec34c2fe03
31 changed files with 66 additions and 16 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="uk.org.openseizuredetector"
-    android:versionCode="38"
+    android:versionCode="39"
    android:versionName="2.6.0">
-    android:versionName="2.5.3">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />