Vincent Breitmoser 1697e22d19 Merge branch 'v/eventbus' into v/multi-decrypt ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java		2015-06-10 17:12:22 +02:00
..
src	Merge branch 'v/eventbus' into v/multi-decrypt	2015-06-10 17:12:22 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	backport CryptoOperationFragment changes without eventbus	2015-06-10 15:45:10 +02:00
proguard-rules.pro	Add dontnote to proguard	2015-05-10 10:44:04 +02:00