diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 23:05:41 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 23:05:41 +0200 |
| commit | 38d8f4be52a08ddf738d73500af0288fea80a4b5 (patch) | |
| tree | 40f8648b0eeafc8612c6061b744df18270bf309e /LICENSE | |
| parent | 40703fe961eef8d884800b70d9af57da9fce2769 (diff) | |
| parent | c4d392051c8967823fd28a75ed5b622219f816f7 (diff) | |
| download | open-keychain-38d8f4be52a08ddf738d73500af0288fea80a4b5.tar.gz open-keychain-38d8f4be52a08ddf738d73500af0288fea80a4b5.tar.bz2 open-keychain-38d8f4be52a08ddf738d73500af0288fea80a4b5.zip | |
Merge remote-tracking branch 'origin/master' into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions