diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-30 15:53:44 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-30 15:53:44 +0200 |
| commit | 91494dd3a339ce14c3c722c22da6ff5c3241630b (patch) | |
| tree | f2f35be53c35d1cc4ddc58474a7a9426bf4e90aa /.gitmodules | |
| parent | 726ff0b501644e0cef6d5d4a086e73c258b2361c (diff) | |
| parent | dcaac4f85f07efff2fdfd8a2eec9ba8ee758659c (diff) | |
| download | open-keychain-91494dd3a339ce14c3c722c22da6ff5c3241630b.tar.gz open-keychain-91494dd3a339ce14c3c722c22da6ff5c3241630b.tar.bz2 open-keychain-91494dd3a339ce14c3c722c22da6ff5c3241630b.zip | |
Merge branch 'development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions