diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-10 17:12:22 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-10 17:12:22 +0200 |
| commit | 1697e22d1954d90289bac06abe23778c371337da (patch) | |
| tree | 39820a156392e15be5fb7d8d33cf6a23aa1c6625 /.gitmodules | |
| parent | d43671b2ed42dba8c0ab8c43a5d171bf842e2782 (diff) | |
| parent | 8da88f33bc3991653f91ccfd589cded23a9653b1 (diff) | |
| download | open-keychain-1697e22d1954d90289bac06abe23778c371337da.tar.gz open-keychain-1697e22d1954d90289bac06abe23778c371337da.tar.bz2 open-keychain-1697e22d1954d90289bac06abe23778c371337da.zip | |
Merge branch 'v/eventbus' into v/multi-decrypt
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions