mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-06 17:25:01 -05:00
c02ef80086
Conflicts: src/eu/siacs/conversations/crypto/PgpEngine.java src/eu/siacs/conversations/persistance/FileBackend.java src/eu/siacs/conversations/ui/ShareWithActivity.java |
||
---|---|---|
.. | ||
crypto | ||
entities | ||
generator | ||
parser | ||
persistance | ||
services | ||
ui | ||
utils | ||
xml | ||
xmpp | ||
Config.java |