imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector

Browse source
This commit is contained in:
Erik Johnston 2015-07-15 13:59:24 +01:00
commit 844a883ad8
3 changed files with 137 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ComponentBroker.js
View file

@ -64,6 +64,7 @@ require('../skins/base/views/atoms/MessageTimestamp');
require('../skins/base/views/atoms/create_room/CreateRoomButton');
require('../skins/base/views/atoms/create_room/RoomNameTextbox');
require('../skins/base/views/atoms/create_room/Presets');
require('../skins/base/views/atoms/EditableText');
require('../skins/base/views/molecules/MatrixToolbar');
require('../skins/base/views/molecules/RoomTile');
require('../skins/base/views/molecules/MessageTile');