conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-1/+2
\|\
\| *	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	1	-1/+2
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	1	-2/+2
\| \|\ \| \|/ \|/\|
* \|	Fixed layout issue with emojicon tastatur button	steckbrief	2016-02-12	1	-1/+0
* \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-2/+3
\|\ \
\| * \|	changed sizes of avatars and padding in new message bubbles	Daniel Gultsch	2015-07-20	1	-3/+0
\| * \|	changed message bubble appearance	Raphael Pohl	2015-07-20	1	-1/+4
\| * \|	renamed colors	Daniel Gultsch	2015-07-13	1	-7/+7
\| * \|	replace send button with quick action button as long as no text has been entered	Daniel Gultsch	2015-05-02	1	-1/+1
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-4/+6
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Implements FS#83: Reload from last received message	steckbrief	2015-12-04	1	-4/+6
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-1/+1
\|\\| \|
\| * \|	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	1	-1/+1
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	1	-0/+8
\| \|\ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	1	-8/+8
\| \|\ \
\| * \| \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-2/+2
* \| \| \|	- Introduction of SwipeRefreshLayout for conversation view	steckbrief	2015-08-12	1	-0/+8
\| \|/ / \|/\| \|
* \| \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-8/+8
\|/ /
* /	whatsapp-like smiley implementation	lookshe	2015-04-12	1	-1/+10
\|/
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+102