305 commits

Author	SHA1	Message	Date
Matthew Hodgson	b60ccad29b	Merge branch 'develop' into matthew/slate	2018-05-15 01:00:07 +01:00
Matthew Hodgson	c1000a7cd5	emojioneify the composer ... and also fix up the selectedness CSS for pills and emoji	2018-05-14 03:02:12 +01:00
Michael Telatynski	ee0e6c5913	Remove margins when in a ReplyThread to stop them taking so much space ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-09 11:53:37 +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	79d3cca6e9	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00