diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-29 21:32:21 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-29 21:32:21 +0200 |
| commit | 0b16a4edfd102972b48b96b4de1ce30e029a47b5 (patch) | |
| tree | bb4c3df979f22325995dacaced7cfbb1ff1ba2ac /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | |
| parent | 7f547afe42da896697ae605dbfb6e4734ac42c36 (diff) | |
| parent | f7fe236bd535e62f60a7f76768b7455ef102255e (diff) | |
| download | open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.tar.gz open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.tar.bz2 open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/AndroidManifest.xml
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java')
0 files changed, 0 insertions, 0 deletions