conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \|
\| *	pulled translations from transifex	Daniel Gultsch	2016-02-19	1	-10/+0
\| \|
* \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-3/+0
\| \|
* \|	Unused preference 'picture_compression'. This feature is configured in our ↵	steckbrief	2016-02-13	1	-2/+0
\| \| \| \| \| \| \| \|	variant via 'resize_picture'
* \|	green bubbles and setting to choose green or white bubbles removed	steckbrief	2016-02-12	1	-2/+0
\|/
*	pulled translations from transifex	Daniel Gultsch	2016-01-20	1	-9/+38
\|
*	pulled translations for 1.9.0 release from transifex1.9.0	Daniel Gultsch	2016-01-14	1	-2/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2016-01-12	1	-4/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2016-01-11	1	-3/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-12-17	1	-1/+300
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-12-02	1	-4/+53
\|
*	pulled translations from transifex	Daniel Gultsch	2015-10-14	1	-1/+6
\|
*	pulled translations from transifex	Daniel Gultsch	2015-10-13	1	-0/+177