46f147a82c
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib |
||
---|---|---|
.. | ||
attachment_choices.xml | ||
choose_contact.xml | ||
conference_context.xml | ||
contact_context.xml | ||
contact_details.xml | ||
conversations.xml | ||
encryption_choices.xml | ||
manageaccounts.xml | ||
manageaccounts_context.xml | ||
message_context.xml | ||
muc_details.xml | ||
share_with.xml | ||
start_conversation.xml |