diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-05 23:29:43 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-05 23:29:43 +0100 |
| commit | 23b8e8272cfd1b2f9f56771f30b944c93db53d9d (patch) | |
| tree | 3aba47ab5b0de2e978a6d89b6f0739b9cc0b2f6f /OpenKeychain/src/main/res/layout/create_key_activity.xml | |
| parent | e50eda4e29e4618e29756f19ec67b1d5ac0e9733 (diff) | |
| parent | 438314c4bb092235331484262183d68810d6cd8f (diff) | |
| download | open-keychain-23b8e8272cfd1b2f9f56771f30b944c93db53d9d.tar.gz open-keychain-23b8e8272cfd1b2f9f56771f30b944c93db53d9d.tar.bz2 open-keychain-23b8e8272cfd1b2f9f56771f30b944c93db53d9d.zip | |
Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/create_key_activity.xml')
0 files changed, 0 insertions, 0 deletions