Merge branch 'master-upstream'

2017-06-02 16:58:28 +02:00 · 2017-06-02 16:58:28 +02:00 · f83c1470a4
parent 94639eeb69 9e7229bfcc
commit f83c1470a4
2 changed files with 0 additions and 2 deletions
--- a/app/.gitignore
+++ b/app/.gitignore
@ -1,4 +1,2 @@
 /build
 app-release.apk
-app-google-release.apk
-src/main/res/raw/keystore_tusky_api.bks
--- a/app/src/main/res/raw/keystore_tusky_api.bks
+++ b/app/src/main/res/raw/keystore_tusky_api.bks