Merge branch 'release-1.3.1' into development

markormesher · May 28, 2017 · 2894540 · 2894540
2 parents bf86585 + 4f6bbb1
commit 2894540
Show file tree

Hide file tree

Showing 4 changed files with 10,822 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ buildscript {
 }
 
 def version = new Properties()
-version['code'] = 10
-version['name'] = '1.3.0'
+version['code'] = 11
+version['name'] = '1.3.1'
 
 def secrets = getSecrets()
 

diff --git a/fab/build.gradle b/fab/build.gradle
@@ -13,8 +13,8 @@ buildscript {
 }
 
 def version = new Properties()
-version['code'] = 10
-version['name'] = '1.3.0'
+version['code'] = 11
+version['name'] = '1.3.1'
 
 apply plugin: 'me.tatarka.retrolambda'
 

diff --git a/misc/proguard-mappings/10.txt → misc/proguard-mappings/build-10.txt b/misc/proguard-mappings/10.txt → misc/proguard-mappings/build-10.txt