Merge remote-tracking branch 'origin/develop' into kotlin

# Conflicts: # twidere/src/main/java/org/mariotaku/twidere/fragment/UserProfileEditorFragment.java
2016-07-12 09:27:42 +08:00 · 2016-07-12 09:27:42 +08:00 · f22dd7cdf3
parent 9593365fa5 943a5f8357
commit f22dd7cdf3
1 changed files with 2 additions and 2 deletions
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@ -35,8 +35,8 @@ android {
        applicationId "org.mariotaku.twidere"
        minSdkVersion 14
        targetSdkVersion 24
-        versionCode 200
-        versionName "3.1.11"
+        versionCode 201
+        versionName "3.1.12"
        multiDexEnabled true

        buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("false")'