conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	1	-0/+7
\|\
\| *	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-0/+7
* \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-19/+19
\|/
*	Remove title_activity_conversations and use app_name instead	kruks23	2015-01-30	1	-2/+2
*	migrated change password into separate activity	Daniel Gultsch	2015-01-03	1	-0/+3
*	Add support for XEP-0191 (Blocking command)	Sam Whited	2014-12-22	1	-0/+3
*	Allow sending of any filetype via intent	Sam Whited	2014-12-15	1	-1/+1
*	initial smp support	iNPUTmice	2014-11-11	1	-0/+4
*	use proper theme for MTM	iNPUTmice	2014-11-09	1	-4/+8
*	Convert about dialog to activity	Sam Whited	2014-11-04	1	-23/+33
*	fixed merge errornfc	iNPUTmice	2014-11-03	1	-1/+0
*	Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc	iNPUTmice	2014-11-03	1	-0/+1
\|\
\| *	basic beam code / untested	iNPUTmice	2014-11-03	1	-22/+20
* \|	use different filter for nfc intents	iNPUTmice	2014-11-03	1	-1/+1
* \|	basic beam code / untested	iNPUTmice	2014-11-03	1	-22/+20
\|/
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+118