diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-28 00:39:18 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-28 00:39:18 +0100 |
| commit | fd55cdb08e47b87d2fdc98d15fc679725e2d2619 (patch) | |
| tree | 015276c8b732179deda7aa1a5b6f3719671787bd /extern/openpgp-api-lib | |
| parent | 453b67f7a8cb274d794843e54d6d050a7ef7a98a (diff) | |
| parent | 9c62c3fd3985958a43707c7a25f07744a6cfcb95 (diff) | |
| download | open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.tar.gz open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.tar.bz2 open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
Diffstat (limited to 'extern/openpgp-api-lib')
0 files changed, 0 insertions, 0 deletions