conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	very subtle	Daniel Gultsch	2015-07-21	1	-9/+11
\|
*	changed sizes of avatars and padding in new message bubbles	Daniel Gultsch	2015-07-20	1	-10/+11
\|
*	changed message bubble appearance	Raphael Pohl	2015-07-20	1	-28/+27
\|
*	fixed some ux glitches in editaccount	Daniel Gultsch	2015-07-16	1	-1/+0
\|
*	renamed colors	Daniel Gultsch	2015-07-13	1	-4/+4
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+97