Commit graph

4 commits

Author SHA1 Message Date
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
Jakob Nixdorf
9758ae1ea1
Update Android Studio stuff 2019-02-13 07:51:56 +01:00
Jakob Nixdorf
96a41e3464
Update target SDK, gradle and modules. 2017-06-28 15:13:30 +02:00
Bruno Bierbaumer
faec1dfd88 initial code dump 2015-11-23 22:20:14 +01:00