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	WIP! Merge branch 'v/eventbus' into v/multi-decrypt	2015-06-07 00:05:14 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	eventbus: initial attempt, replace messenger hack with eventbus communication	2015-06-06 23:17:42 +02:00
proguard-rules.pro	Add dontnote to proguard	2015-05-10 10:44:04 +02:00