Merge remote-tracking branch 'origin/develop' into kotlin
# Conflicts: # twidere/src/main/java/org/mariotaku/twidere/fragment/UserProfileEditorFragment.java
This commit is contained in:
commit
f22dd7cdf3
|
@ -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")'
|
||||
|
|
Loading…
Reference in New Issue