Dominik Schürmann fd55cdb08e Merge branch 'development' of github.com:open-keychain/open-keychain into development ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java		2015-02-28 00:39:18 +01:00
..
src/main	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2015-02-28 00:39:18 +01:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Enable multi line snackbar option	2015-02-27 23:47:15 +01:00