conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-8/+66
\|\
\| *	show per conference notification settings in details activity	Daniel Gultsch	2016-01-08	1	-0/+27
\| *	Reset the margins manually after rotating	saqura	2015-10-26	1	-0/+1
\| *	Show whether MAM is supported in MUCs	saqura	2015-10-06	1	-1/+30
\| *	very subtle	Daniel Gultsch	2015-07-21	1	-6/+7
\| *	renamed colors	Daniel Gultsch	2015-07-13	1	-6/+6
\| *	increased padding on image buttons on v21 to match material guidelines	Daniel Gultsch	2015-04-28	1	-2/+2
* \|	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	1	-5/+5
* \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-8/+8
\|/
*	Use Material Design Icons on API 21+	Sam Whited	2015-01-29	1	-2/+2
*	make use of different dimensions for different screen sizes	Daniel Gultsch	2015-01-13	1	-4/+10
*	shortened some string	Daniel Gultsch	2015-01-11	1	-0/+1
*	fixed #860	Daniel Gultsch	2015-01-10	1	-0/+1
*	allow for very basic muc configuration	Daniel Gultsch	2015-01-08	1	-115/+142
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+119