mirror of
https://github.com/moparisthebest/Conversations
synced 2024-08-13 15:53:48 -04:00
46f147a82c
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
||
---|---|---|
.. | ||
arrays.xml | ||
strings.xml |