sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

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

Browse Source
This commit is contained in:
Erik Johnston
2015-07-21 10:39:46 +01:00
parent af190f286c 3657029fc7
commit 0b1b6057d6
25 changed files with 434 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ComponentBroker.js
+2 -1
View File
@@ -97,9 +97,10 @@ require('../skins/base/views/molecules/RoomSettings');
require('../skins/base/views/organisms/LeftPanel');
require('../skins/base/views/organisms/RightPanel');
require('../skins/base/views/organisms/LogoutPrompt');
require('../skins/base/views/organisms/RoomDirectory');
require('../skins/base/views/molecules/RoomCreate');
require('../skins/base/views/molecules/RoomDropTarget');
require('../skins/base/views/molecules/DirectoryMenu');
require('../skins/base/views/molecules/BottomLeftMenu');
require('../skins/base/views/molecules/DateSeparator');
require('../skins/base/views/atoms/voip/VideoFeed');
require('../skins/base/views/molecules/voip/VideoView');