element-web-Github/src/components/views
Luke Barnard acde1f3db7 Merge branch 'develop' into luke/rts-welcome-pages
Conflicts:
	src/components/views/avatars/BaseAvatar.js
2017-02-01 17:22:45 +00:00
..
avatars Fix a bunch of lint complaints 2017-01-24 22:41:52 +00:00
create_room Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
dialogs Fix inviting import fail 2017-01-27 21:57:34 +00:00
elements Look up email addresses in ChatInviteDialog 2017-01-25 18:51:28 +00:00
login Redo team-based registration (#657) 2017-01-27 16:31:36 +00:00
messages Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
room_settings fix a bunch of dark-theme buttons 2017-01-20 21:00:22 +00:00
rooms Merge branch 'develop' into luke/rts-welcome-pages 2017-02-01 17:22:45 +00:00
settings Merge pull request #646 from matrix-org/matthew/password-reset-warning 2017-01-25 11:04:35 +00:00
voip Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00