PiratX - The new way for communications

	Commit message (Expand)	Author	Age	Files	Lines
*	copy commits	Christian S	2015-07-16	1	-1/+0
\|\
\| *	fixed some ux glitches in editaccount	Daniel Gultsch	2015-07-16	1	-1/+0
* \|	Merge branch 'development' of https://github.com/siacs/Conversations into sia...	Christian S	2015-07-14	1	-4/+4
\|\\|
\| *	renamed colors	Daniel Gultsch	2015-07-13	1	-4/+4
* \|	small avatar modifications	Christian S	2015-07-04	1	-2/+6
\|/
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-2/+2
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+97