diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-06 04:35:05 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-06 04:35:05 +0200 |
| commit | d1b0d0fa5e3a49337af53ea86c779c72e4db8567 (patch) | |
| tree | d3889b719fd84b2a66e2e2323c80ba0fd0d93ba0 /CHANGELOG | |
| parent | 456a634149d0eecb00f6d7e0053a71f1b19538b6 (diff) | |
| parent | 22a6bfb98580f541010681712d126d0cc8dd2834 (diff) | |
| download | open-keychain-d1b0d0fa5e3a49337af53ea86c779c72e4db8567.tar.gz open-keychain-d1b0d0fa5e3a49337af53ea86c779c72e4db8567.tar.bz2 open-keychain-d1b0d0fa5e3a49337af53ea86c779c72e4db8567.zip | |
Merge remote-tracking branch 'origin/master' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions