46f147a82c
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
||
---|---|---|
.. | ||
AccountAdapter.java | ||
ConversationAdapter.java | ||
KnownHostsAdapter.java | ||
ListItemAdapter.java | ||
MessageAdapter.java |