conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Imports organized	steckbrief	2016-02-12	1	-2/+2
\|
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	1	-1/+1
\|\
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	1	-6/+6
\|\\|
\| *	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-161/+0
\|/ \| \| \| \| \|	"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-0/+161
	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib