diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-06 23:39:26 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-06 23:40:22 +0200 |
| commit | b779211f55a126d54c643fb9f13a0a17b46c37bf (patch) | |
| tree | a526af2e5d385691c20393560443e17f9a61201a /OpenKeychain/src/main/res/values/arrays.xml | |
| parent | fa614383065a22269c5ca249819c46b82e20a194 (diff) | |
| parent | 7cfc0d80d0b4318ce1ae027536d70c2cda4c8605 (diff) | |
| download | open-keychain-b779211f55a126d54c643fb9f13a0a17b46c37bf.tar.gz open-keychain-b779211f55a126d54c643fb9f13a0a17b46c37bf.tar.bz2 open-keychain-b779211f55a126d54c643fb9f13a0a17b46c37bf.zip | |
Merge branch 'master' into v/multi-decrypt
this also fixes weird-bug
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values/arrays.xml')
0 files changed, 0 insertions, 0 deletions