diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 19:48:19 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 19:48:19 +0200 |
| commit | 0e152d1db0dbebd6c48498f449efecfaa2c4a2bc (patch) | |
| tree | d098d40e7aa49495d8fc9c119829c3828035da8a /.gitignore | |
| parent | f46f2b6895ac0c9c5c000e93457cb66049269ed0 (diff) | |
| parent | 2a96912a96f6b740c40331fb83f715d4d1abf597 (diff) | |
| download | open-keychain-0e152d1db0dbebd6c48498f449efecfaa2c4a2bc.tar.gz open-keychain-0e152d1db0dbebd6c48498f449efecfaa2c4a2bc.tar.bz2 open-keychain-0e152d1db0dbebd6c48498f449efecfaa2c4a2bc.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions