diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
| commit | 4afd6b881edfd0bc404734a4e8959a7a0fa785a7 (patch) | |
| tree | 63a051fb595d168f8ddbfd76a51bb2319889d40b /Graphics | |
| parent | ba7d8a58673d55660bc7faf68970229f17458514 (diff) | |
| parent | db39b779c984a758e13adc16837893509f3b364f (diff) | |
| download | open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.gz open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.bz2 open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'Graphics')
0 files changed, 0 insertions, 0 deletions