Vincent Breitmoser cfa2ecca61 WIP! Merge branch 'v/eventbus' into v/multi-decrypt ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java

2015-06-07 00:05:14 +02:00

..

src/test

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

2015-06-07 00:05:14 +02:00

build.gradle

updated robolectric to support new android support libs

2015-05-03 14:06:01 -07:00