Michael Schättgen ded23a3ae9 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/me/impy/aegis/KeyProfileAdapter.java		2016-10-25 23:57:19 +02:00
..
src	Merge remote-tracking branch 'origin/master'	2016-10-25 23:57:19 +02:00
.gitignore	Initial commit	2016-08-15 21:29:41 +02:00
build.gradle	Order is now getting saved properly	2016-10-25 23:53:33 +02:00
proguard-rules.pro	Initial commit	2016-08-15 21:29:41 +02:00