Michael Telatynski 2230b7732a rearrange ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>		2020-01-16 01:45:16 +00:00
..
auth	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
avatars	Merge branch 'develop' into travis/sourcemaps	2020-01-13 11:19:41 -07:00
context_menus	Fix more imports post-merge	2020-01-09 14:19:19 -07:00
create_room	Convert CommonJS exports to ES6-compatible exports	2019-12-22 21:01:02 -07:00
dialogs	Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n	2020-01-15 10:49:38 -07:00
directory	Fix MatrixClientPeg imports	2019-12-22 21:15:54 -07:00
elements	Fix more imports post-merge	2020-01-09 14:19:19 -07:00
emojipicker	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
globals	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
groups	rearrange	2020-01-16 01:45:16 +00:00
messages	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
right_panel	Merge branch 'develop' into travis/sourcemaps	2020-01-13 11:19:41 -07:00
room_settings	Appease the linter	2020-01-13 13:28:33 -07:00
rooms	rearrange	2020-01-16 01:45:16 +00:00
settings	Fix imports for help & support tab	2020-01-15 12:02:34 -07:00
terms	Convert many imports to handle ES6 exports	2019-12-22 21:04:42 -07:00
toasts	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
verification	Merge pull request #3839 from matrix-org/travis/sourcemaps	2020-01-15 10:11:33 -07:00
voip	Merge branch 'travis/babel7-wp-es6-export' into travis/sourcemaps-es6	2019-12-22 21:20:13 -07:00