marverix d630001940 Merge branch 'master' of github.com:andOTP/andOTP ... # Conflicts: # app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java		2019-02-23 09:39:48 +01:00
..
src	Merge branch 'master' of github.com:andOTP/andOTP	2019-02-23 09:39:48 +01:00
.gitignore	initial code dump	2015-11-23 22:20:14 +01:00
build.gradle	Bump to version 0.6.1	2018-12-05 07:45:42 +01:00
proguard-rules.pro	initial code dump	2015-11-23 22:20:14 +01:00