diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-05 23:56:29 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-05 23:56:29 +0200 |
| commit | e2164f571ed80928527cfdebaf3e2655350e9471 (patch) | |
| tree | 4d74a1726a6281fc582e215804499900bda8cbf4 /OpenKeychain/src/main/res/values-large | |
| parent | 36312b950aa2e3150ec9381c91850c63ed1c604b (diff) | |
| parent | 255462def4830fa6ad3f7ab164d207501dbed36c (diff) | |
| download | open-keychain-e2164f571ed80928527cfdebaf3e2655350e9471.tar.gz open-keychain-e2164f571ed80928527cfdebaf3e2655350e9471.tar.bz2 open-keychain-e2164f571ed80928527cfdebaf3e2655350e9471.zip | |
Merge branch 'master' into automatic-contact-discovery
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/res/values-large')
0 files changed, 0 insertions, 0 deletions