Matthew Hodgson 4fbf34e05b Merge branch 'develop' into matthew/dharma		2018-08-03 17:15:00 -07:00
..
avatars	merge vector-im/riot-web#5881 into matrix-react-sdk	2018-04-16 00:04:04 +01:00
context_menus	merge vector-im/riot-web#5881 into matrix-react-sdk	2018-04-16 00:04:04 +01:00
dialogs	Merge pull request #1948 from matrix-org/export_Group	2018-06-15 10:52:27 +01:00
directory	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00
elements	merge develop	2018-07-09 17:50:07 +01:00
globals	Support MAU error on sync	2018-08-03 14:54:52 +01:00
groups	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00
login	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00
messages	Merge pull request #1912 from matrix-org/luke/kill-mimage-fixupheight	2018-06-14 11:17:15 +01:00
rooms	Merge branch 'develop' into matthew/dharma	2018-07-29 17:03:23 +01:00
settings	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00
voip	move components' CSS to be in the same repo as their JS	2018-04-12 00:23:58 +01:00