conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4	lookshe	2016-05-26	1	-1/+56
\|\
\| *	also save form elements in disco storage	Daniel Gultsch	2016-05-19	1	-2/+56
\| *	use the same typo in both saving disco and reading disco	Daniel Gultsch	2016-05-15	1	-1/+2
* \|	Merge tag '1.11.3' into trz/rebase	lookshe	2016-04-05	1	-2/+30
\|\\|
\| *	add methods to check max file size for http upload	Daniel Gultsch	2016-03-31	1	-0/+13
\| *	include form fields into caps hash calculation	Daniel Gultsch	2016-03-31	1	-2/+17
* \|	Reviewed commit for FS#34 after merge	steckbrief	2016-02-24	1	-1/+1
\|/
*	cache server caps	Daniel Gultsch	2016-02-03	1	-1/+18
*	refactored disco cache. avoid making duplicate call. check hash	Daniel Gultsch	2016-02-03	1	-7/+13
*	Persisitence and loading for ServiceDiscoveryResult	Stephen Paul Weber	2016-01-23	1	-10/+58
*	Implement toJSON on ServiceDiscoveryResult	Stephen Paul Weber	2016-01-23	1	-0/+34
*	Generate capHash from any discovery result	Stephen Paul Weber	2016-01-23	1	-4/+80
*	Factor out a representation of XEP-0030 results	Stephen Paul Weber	2016-01-23	1	-0/+84