diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-23 23:33:50 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-23 23:33:50 +0200 |
| commit | efa5a80eb618f401bfe14480400acfc39acd5b7e (patch) | |
| tree | cc739bce253f959608622db4727a7bda06fb0a6c /OpenKeychain/src/main/java/android | |
| parent | 1624cd8349876f267e2cb4d37341b5cc52b25f98 (diff) | |
| parent | 76a1e99d7e30679722ffe2cb0c8c12b048adc369 (diff) | |
| download | open-keychain-efa5a80eb618f401bfe14480400acfc39acd5b7e.tar.gz open-keychain-efa5a80eb618f401bfe14480400acfc39acd5b7e.tar.bz2 open-keychain-efa5a80eb618f401bfe14480400acfc39acd5b7e.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
Diffstat (limited to 'OpenKeychain/src/main/java/android')
0 files changed, 0 insertions, 0 deletions