element-web

mirror of https://github.com/vector-im/element-web.git synced 2025-08-25 00:11:43 +02:00

History

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

2017-02-01 11:44:04 +00:00

ContextualMenu.js

2017-01-20 14:22:27 +00:00

CreateRoom.js

2017-01-20 14:22:27 +00:00

FilePanel.js

2017-01-20 14:22:27 +00:00

LoggedInView.js

2017-02-01 17:22:45 +00:00

MatrixChat.js

2017-02-01 17:22:45 +00:00

MessagePanel.js

2017-01-24 14:22:18 +00:00

NotificationPanel.js

2016-09-11 02:14:27 +01:00

RoomStatusBar.js

Fix linting warnings

2017-01-24 17:18:56 +00:00

RoomView.js

2017-01-26 18:07:42 +00:00

ScrollPanel.js

2017-01-31 22:40:53 +00:00

TimelinePanel.js

2017-01-20 14:22:27 +00:00

UploadBar.js

2017-01-20 14:22:27 +00:00

UserSettings.js

2017-01-31 15:17:43 +00:00