3 commits

Author	SHA1	Message	Date
David Baker	f928be6f59	Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" ... This reverts commit ad47144355.	2019-01-03 15:37:03 -07:00
David Baker	7d161de35b	Partial merge of develop to experimental ... Does not include #2336 as the file has been moved out from underneath it: will do this separately	2019-01-03 15:02:58 +00:00
David Baker	e3b7330e3f	Add CONTRIBUTING.rst file	2016-02-25 16:17:55 +00:00