diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-04 14:42:21 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-04 14:42:21 +0200 |
| commit | 520f9abea309b5a703177b6e10b95ddb61443cc6 (patch) | |
| tree | b3eed905db2dfb99080dd136eb237f5bf940f827 /OpenKeychain/src/main/res/xml | |
| parent | 045ea93ee1d29ea680d4e095153eb89f6531c7b2 (diff) | |
| parent | e159e619d299c0e91f3f9527186e50649657dd73 (diff) | |
| download | open-keychain-520f9abea309b5a703177b6e10b95ddb61443cc6.tar.gz open-keychain-520f9abea309b5a703177b6e10b95ddb61443cc6.tar.bz2 open-keychain-520f9abea309b5a703177b6e10b95ddb61443cc6.zip | |
Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
0 files changed, 0 insertions, 0 deletions