RichyHBM d219066153 Merge branch 'master' into google-backups ... # Conflicts: # app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java # app/src/main/res/xml/preferences.xml		2018-02-10 17:15:40 +00:00
..
src	Merge branch 'master' into google-backups	2018-02-10 17:15:40 +00:00
.gitignore	initial code dump	2015-11-23 22:20:14 +01:00
build.gradle	Bug fix release 0.4.0.1	2018-02-01 10:11:31 +01:00
proguard-rules.pro	initial code dump	2015-11-23 22:20:14 +01:00