mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-13 12:45:01 -05:00
46f147a82c
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
||
---|---|---|
.. | ||
actionbar_tab_indicator.xml | ||
es_slidingpane_shadow.xml | ||
grey.xml | ||
greybackground.xml | ||
infocard_border.xml | ||
message_border.xml | ||
snackbar.xml |