conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	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