Merge branch 'master-upstream'

8 years ago · e32441be49
parent 6e4725d2dd fcc9d63b1c
commit e32441be49
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