46f147a82c
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
||
---|---|---|
.. | ||
DatabaseBackend.java | ||
FileBackend.java | ||
OnPhoneContactsMerged.java |
46f147a82c
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
||
---|---|---|
.. | ||
DatabaseBackend.java | ||
FileBackend.java | ||
OnPhoneContactsMerged.java |