conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-2/+74
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml 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-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
\| *	pulled translations from transifex	Daniel Gultsch	2016-02-19	1	-10/+0
\| \|
\| *	pulled translations from transifex	Daniel Gultsch	2016-02-11	1	-2/+78
\| \|
* \|	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-12	1	-2/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2016-01-11	1	-3/+0
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-12-02	1	-6/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-10-14	1	-1/+0
\|
*	pulled translations from transifex	Daniel Gultsch	2015-10-13	1	-0/+15
\|
*	pulled translations from transifex	Daniel Gultsch	2015-09-14	1	-1/+0
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-09-13	1	-0/+28
\|
*	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
\|
*	pulled translations from transifex1.6.0	Daniel Gultsch	2015-08-19	1	-0/+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 translations from transifex	Daniel Gultsch	2015-05-20	1	-0/+5
\|
*	pulled new translations from transifex	Daniel Gultsch	2015-05-16	1	-0/+25
\|
*	pulled translations from transifex	Daniel Gultsch	2015-04-26	1	-2/+8
\|
*	pulled latest translations from transifex	Daniel Gultsch	2015-04-20	1	-1/+332
\|
*	pulled translations from transifex	iNPUTmice	2015-02-16	1	-0/+89