diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 23:06:32 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 23:06:32 +0200 |
| commit | 8132b9ac745f6eedd4a7746f1e67358a61e9e4a7 (patch) | |
| tree | f1c8c520a449f3ef306e1e1e7e2b1bc70a3240ad /gradle | |
| parent | d8f278229352a58dbdcf49bb65538249f8c4ccc0 (diff) | |
| parent | 45722d7cfbb2996ff994b3f2143e5871c2e564ba (diff) | |
| download | open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.tar.gz open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.tar.bz2 open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.zip | |
Merge branch 'master' into ditch-appmsg
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
Diffstat (limited to 'gradle')
0 files changed, 0 insertions, 0 deletions