diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 20:54:11 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-04 20:54:11 +0100 |
| commit | bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e (patch) | |
| tree | e325bbcb7b24a5144f821bb11e9bd9120edfedf0 /OpenKeychain/src/main/java/android/support | |
| parent | e312b0e675fcd81b19b95453f04b55aee927b1f3 (diff) | |
| parent | 024ba19499f6975e2e153ca496d94cb5124f5dd8 (diff) | |
| download | open-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.tar.gz open-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.tar.bz2 open-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.zip | |
Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/java/android/support')
0 files changed, 0 insertions, 0 deletions