2804 Commits (7d4698da49abebf0a8dbf1e54c49abe9103d8c4c)

Author	SHA1	Message	Date
Michael Telatynski	563fc9adc7	fix bad copy-paste from other diff ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 09:37:25 +01:00
Michael Telatynski	06408f843b	post BigMerge fixup - merge in stuff from riot-web PR ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 09:23:27 +01:00
Matthew Hodgson	32dd7f976f	merge vector-im/riot-web#5881 into matrix-react-sdk	2018-04-16 00:04:04 +01:00
Matthew Hodgson	79d3cca6e9	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00