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

..

android/support/v4/widget

Remove unused FixedDrawerLayout

2015-02-23 00:30:02 +01:00

org

Merge branch 'v/eventbus' into v/multi-decrypt

2015-06-10 17:12:22 +02:00