Michael Langer fce81f4ca3 Merge branch 'master' into auto-unlock-after-autofill ... # Conflicts: # app/src/main/java/org/shadowice/flocke/andotp/Activities/AuthenticateActivity.java		2021-02-26 08:31:44 +01:00
..
src	Merge branch 'master' into auto-unlock-after-autofill	2021-02-26 08:31:44 +01:00
.gitignore	initial code dump	2015-11-23 22:20:14 +01:00
build.gradle	Update some dependencies	2021-01-29 07:10:43 +01:00
proguard-rules.pro	initial code dump	2015-11-23 22:20:14 +01:00