conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #1500 from SafwatHalaby/readme	Daniel Gultsch	2015-10-13	1	-2/+2
\|\ \| \| \| \|	Minor README changes
\| *	Minor README changes	Safwat Halaby	2015-10-13	1	-2/+2
\| \|
* \|	Added OMEMO to Readme	Safwat Halaby	2015-10-10	1	-5/+3
\|/
*	Update build system in README	Safwat Halaby	2015-10-10	1	-1/+1
\| \| \|	Fixes #1479.
*	added referrer to playstore links	Daniel Gultsch	2015-09-12	1	-3/+3
\|
*	added XEP number for http file upload	Daniel Gultsch	2015-08-27	1	-1/+1
\|
*	OMEMO logo	fiaxh	2015-08-09	1	-0/+1
\|
*	linked XEPs in README	Daniel Gultsch	2015-07-28	1	-9/+9
\|
*	fixed another typo	Christian S.	2015-07-16	1	-1/+0
\|
*	Merge pull request #1283 from Manouchehri/development	Daniel Gultsch	2015-07-16	1	-1/+1
\|\ \| \| \| \|	Fixed broken URL.
\| *	Fixed broken URL.	David Manouchehri	2015-07-15	1	-1/+1
\| \| \| \| \| \|	The HTTPS server is throwing GitHub's certificate instead of a proper one, so I'm going to stick with HTTP for now.
* \|	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 BrianBlade to list * linked Pull Requests for each Contributor
*	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #791 Squash of commits: 534f25d7dae3ce6852243e28fdd0a69ac01e9463 808fdf5147f27a912a60bee39aa4bf1ddd4f43b4 1eaf8a8330710ad35ba7c368e04f909af623ae4c 31585242c2359efdcd0eeddb9745077f54dbc9eb 2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b e904fb5015bf3a1904ab941a1957edf3b1e7abd2 eebbadf3b3816bbf8fcccb763e419fed252d266f 7c5b87724ce494e5a6e8026557ed50a8fd9f23e8 b0eaaf446937794fe19cbdb4f8309c3ff83d4e42 8c652f9e8bb3512958d9ad8c6f1326505f2d98c8 ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f f5d49897e0dba691ef53a0eddb9ed34d129ad442 a08fa64c505bd895b7c626cfad182380373be20b de67079113e08394a276048c31f6b21baa300829 9069f342173ba30c2b20c67529c7ff497a6a257d 0169fa79d161ee898c4b6762e207087682a952d8 8585a5bd75a5d56927fed8317729bd15fffe4dcc 0053528a078369e0b65dcf71bda251072a1299c7 e901a9c3554bd7cca193e92919b463991eadfea7 c5c78257434813c69ab9b7558bcc8f7cbe858433 e905af348d46d77bc46b5f7211527684acc02fab 13a0f9a10c7892b0f90f5fabd2f2615701b0fd66 2cfba1e24b0139839e4453b92be7e20634d150cf 58e074fb5bb44b05a8104250fccd7c024c808c1a 0d6cf98fc8eab212d798ac79b336f9b70a14f06d e23620f56b85bcab9f3b5d9ce1c01524cd9674dc d72cd2fcc8d54176c3ff53411a69b9bb4642eff3 195143dff8836623a37094a6b8fa6aa01ef31580 5f5f3caf3a1e480a99d27ee5c34ba516419c52e4 1dee3d5861c9f9c710da4cbda3688d94c622ca93 23949b8aa32c78b27bab49bb3c4f3ff588925ce1 9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
*	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