diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-07 18:19:52 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-07 18:19:52 +0200 |
| commit | e54dd26d29632f41ba77533a0914b03c08dd898f (patch) | |
| tree | 19bb04c912ac8f3a41233e2e9fd4da50a1a17248 /.gitmodules | |
| parent | fed11b26472e8fd2045a31facfd6c555f8bc06b9 (diff) | |
| parent | b02519ce253664951aa2307e764b1833d2b88b52 (diff) | |
| download | open-keychain-e54dd26d29632f41ba77533a0914b03c08dd898f.tar.gz open-keychain-e54dd26d29632f41ba77533a0914b03c08dd898f.tar.bz2 open-keychain-e54dd26d29632f41ba77533a0914b03c08dd898f.zip | |
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions