open-keychain/OpenKeychain
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
build.gradle backport CryptoOperationFragment changes without eventbus 2015-06-10 15:45:10 +02:00
proguard-rules.pro