RichyHBM 41ca299af6 Merge branch 'master' into google-backups ... # Conflicts: # app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java # app/src/main/java/org/shadowice/flocke/andotp/Utilities/DatabaseHelper.java # app/src/main/res/values/settings.xml # app/src/main/res/values/strings_settings.xml # app/src/main/res/xml/preferences_special.xml		2018-01-11 13:58:40 +00:00
..
src	Merge branch 'master' into google-backups	2018-01-11 13:58:40 +00:00
.gitignore	initial code dump	2015-11-23 22:20:14 +01:00
build.gradle	Bump build tools to 27.0.3	2017-12-27 12:41:28 +01:00
proguard-rules.pro	initial code dump	2015-11-23 22:20:14 +01:00