David Baker 7041106bf2 Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit		2017-07-17 17:23:02 +01:00
..
avatars	Change incorrect refs to this.props	2017-07-11 14:31:07 +01:00
create_room	Add more translations..	2017-06-08 09:44:58 +01:00
dialogs	replace q method calls with bluebird ones	2017-07-12 18:05:40 +01:00
elements	Hook up the edit widget button (#1218)	2017-07-14 11:17:59 +01:00
login	comment why we send the empty string	2017-06-23 14:48:15 +01:00
messages	q(...) -> Promise.resolve	2017-07-12 18:05:08 +01:00
room_settings	replace q method calls with bluebird ones	2017-07-12 18:05:40 +01:00
rooms	Merge pull request #1225 from matrix-org/luke/feature-rte-pills	2017-07-14 17:47:16 +01:00
settings	Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit	2017-07-17 17:23:02 +01:00
voip	de-lint views/voip/*	2017-07-01 14:58:46 +01:00