diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 04:56:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 04:56:51 +0100 |
| commit | 531697ffe79384f214033bd4096aa0b177e5517d (patch) | |
| tree | c48bc03238a5d444f1714bb82684d962b499d076 /OpenKeychain-Test/src/test/java/org | |
| parent | 3b7f21d98a667abec9cb9ddf855893b3a1ffdb8b (diff) | |
| parent | b3257e0ffa53f93d550d71c1a5ffcecb4f4df0e5 (diff) | |
| download | open-keychain-531697ffe79384f214033bd4096aa0b177e5517d.tar.gz open-keychain-531697ffe79384f214033bd4096aa0b177e5517d.tar.bz2 open-keychain-531697ffe79384f214033bd4096aa0b177e5517d.zip | |
Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
OpenKeychain/src/main/res/layout/view_key_fragment.xml
Diffstat (limited to 'OpenKeychain-Test/src/test/java/org')
0 files changed, 0 insertions, 0 deletions