Merge branch 'develop' into new-guest-access

This commit is contained in:
David Baker 2017-06-06 11:39:47 +01:00
commit e30fcdba4c
57 changed files with 2000 additions and 296 deletions

View file

@ -35,6 +35,7 @@
@import "./matrix-react-sdk/views/messages/_MImageBody.scss";
@import "./matrix-react-sdk/views/messages/_MNoticeBody.scss";
@import "./matrix-react-sdk/views/messages/_MTextBody.scss";
@import "./matrix-react-sdk/views/messages/_RoomAvatarEvent.scss";
@import "./matrix-react-sdk/views/messages/_TextualEvent.scss";
@import "./matrix-react-sdk/views/messages/_UnknownBody.scss";
@import "./matrix-react-sdk/views/rooms/_Autocomplete.scss";