conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #1283 from Manouchehri/development	Daniel Gultsch	2015-07-16	1	-1/+1
\|\
\| *	Fixed broken URL.	David Manouchehri	2015-07-15	1	-1/+1
* \|	fixed typo	Christian S.	2015-07-16	1	-1/+1
\|/
*	mention http upload component in readme	Daniel Gultsch	2015-07-15	1	-1/+5
*	updated contributor list in README.md	Daniel Gultsch	2015-05-04	1	-6/+7
*	added reference to the location plugin to README	Daniel Gultsch	2015-04-20	1	-1/+2
*	added amazon app store link (us store)	Daniel Gultsch	2015-04-20	1	-1/+1
*	added faq about beta testing	Daniel Gultsch	2015-01-13	1	-0/+10
*	modified readme to link to transifex	Daniel Gultsch	2015-01-09	1	-10/+1
*	added travis build icon to README	Daniel Gultsch	2015-01-04	1	-0/+3
*	Add support for XEP-0191 (Blocking command)	Sam Whited	2014-12-22	1	-1/+3
*	updated readme and xep list	iNPUTmice	2014-12-21	1	-1/+3
*	Single character README fix waste of time pull request.	Sam Whited	2014-12-03	1	-1/+1
*	updated readme	iNPUTmice	2014-12-03	1	-2/+2
*	Added Czech translator name	Jaroslav Lichtblau	2014-12-01	1	-0/+1
*	added faq for srv records	iNPUTmice	2014-11-18	1	-0/+6
*	Update README.md	Ilia Rostovtsev	2014-11-18	1	-2/+2
*	linked conference	iNPUTmice	2014-11-06	1	-1/+1
*	linked conference room	iNPUTmice	2014-11-06	1	-2/+3
*	Removed the last \t from the README...	Sam Whited	2014-11-03	1	-1/+1
*	Another tab fix.	Sam Whited	2014-11-03	1	-1/+1
*	Fix some space/tab issues in README	Sam Whited	2014-11-03	1	-5/+5
*	Tweak README some more	Sam Whited	2014-10-28	1	-2/+3
*	Fix typo in subtree merge directions	Sam Whited	2014-10-28	1	-1/+1
*	Add subtree merge directions to README	Sam Whited	2014-10-28	1	-3/+19
*	Add non-project files back	Sam Whited	2014-10-22	1	-0/+297