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
..
codeStyles	Update Gradle and Android Studio	2018-04-04 13:14:05 +02:00
assetWizardSettings.xml	Update Android Studio stuff	2019-02-13 07:51:56 +01:00
gradle.xml	Merge branch 'master' of github.com:andOTP/andOTP	2019-02-23 09:39:48 +01:00
misc.xml	Merge branch 'master' of github.com:andOTP/andOTP	2019-02-23 09:39:48 +01:00
modules.xml	Rebrand my fork as andOTP	2017-06-28 15:24:41 +02:00
runConfigurations.xml	initial code dump	2015-11-23 22:20:14 +01:00
vcs.xml	Update Android Studio stuff	2019-02-13 07:51:56 +01:00