conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-3/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
\| *	pulled translations from transifex	Daniel Gultsch	2016-04-10	1	-3/+0
\| \|
* \|	pulled from transifex	lookshe	2016-03-23	1	-3/+4
\| \|
* \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-2/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
\| *	pulled translations from transifex	Daniel Gultsch	2016-03-06	1	-2/+0
\| \|
* \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-3/+0
\|/
*	pulled translations from transifex	Daniel Gultsch	2016-02-19	1	-10/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2016-02-11	1	-13/+127
\|
*	pulled translations from transifex	Daniel Gultsch	2016-01-12	1	-2/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2016-01-11	1	-1/+0
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-12-02	1	-4/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-10-14	1	-1/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-09-14	1	-1/+0
\|
*	pulled updated translations from transifex	Daniel Gultsch	2015-08-28	1	-1/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-08-24	1	-2/+0
\|
*	renamed plain text to unencrypted. fixes #1331	Daniel Gultsch	2015-08-24	1	-2/+2
\|
*	sync translations with transifex	Daniel Gultsch	2015-08-03	1	-3/+0
\|
*	made 'check image on http host' message more generic. fixed #1281	Daniel Gultsch	2015-07-16	1	-5/+0
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-06-10	1	-0/+5
\|
*	pulled translations from transifex	Daniel Gultsch	2015-04-29	1	-0/+447