PiratX - The new way for communications

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'siacs/master' into development	Christian S	2016-01-10	1	-0/+28
\|\
\| *	show per conference notification settings in details activity	Daniel Gultsch	2016-01-08	1	-0/+27
* \|	Merge remote-tracking branch 'siacs/master' into development	Christian S	2015-10-31	1	-0/+1
\|\\|
\| *	Reset the margins manually after rotating	saqura	2015-10-26	1	-0/+1
* \|	Merge branch 'siacs/master' into development	Christian S	2015-10-07	1	-0/+28
\|\\|
\| *	Show whether MAM is supported in MUCs	saqura	2015-10-06	1	-1/+30
* \|	copy commits	Christian S	2015-07-23	1	-153/+154
\|\\|
\| *	very subtle	Daniel Gultsch	2015-07-21	1	-6/+7
* \|	Merge branch 'development' of https://github.com/siacs/Conversations into sia...	Christian S	2015-07-14	1	-6/+6
\|\\|
\| *	renamed colors	Daniel Gultsch	2015-07-13	1	-6/+6
* \|	resize avatar views	Christian S	2015-07-08	1	-3/+6
\|/
*	increased padding on image buttons on v21 to match material guidelines	Daniel Gultsch	2015-04-28	1	-2/+2
*	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