conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make account status an enum	Sam Whited	2014-11-15	1	-1/+1
\|
*	Merge branch 'feature/file_transfer' into development	iNPUTmice	2014-11-15	1	-2/+10
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/main/res/values/strings.xml
\| *	fixed description in notifications and conversation overview	iNPUTmice	2014-11-15	1	-2/+10
\| \|
* \|	added low priority and removed date in foreground noticfication	iNPUTmice	2014-11-15	1	-0/+2
\| \|
* \|	turn on foreground service in expert settings	iNPUTmice	2014-11-15	1	-4/+23
\|/
*	fixed notifications for images	iNPUTmice	2014-11-05	1	-13/+34
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-68/+164
\| \| \| \| \| \| \| \| \| \|	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/+237