Merge branch 'master' of github.com:StoryMaker/storymaker

StoryMaker · Jun 10, 2016 · 8c23b3c · 8c23b3c
2 parents bec19f2 + dc0d7af
commit 8c23b3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.storymaker.app"
     android:installLocation="auto"
-    android:versionCode="1100"
-    android:versionName="2.1.5">
+    android:versionCode="1101"
+    android:versionName="2.1.6">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'com.jakewharton.hugo'
 
 android {
-    compileSdkVersion 22
+    compileSdkVersion 23
     buildToolsVersion "23.0.3"
 
     sourceSets {