5 commits

Author	SHA1	Message	Date
Travis Ralston	fde32f13a5	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
Michael Telatynski	ebf7eb698d	Turn RoomAliasField into properly controlled and use in RoomSettings	2019-12-26 18:52:57 +00:00
Travis Ralston	042bd35d79	Fix MatrixClientPeg imports	2019-12-22 21:15:54 -07:00
Travis Ralston	d56f0f2a25	Convert many imports to handle ES6 exports ... Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761	2019-12-22 21:04:42 -07:00
Bruno Windels	8a1c1bbec4	implement RoomAliasField component ... adding a postfix to Field to show the domain name	2019-09-23 11:22:30 +02:00