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

2015-07-20 16:31:02 +01:00
parent eae0972820 6fe842e130
commit 1b6ca2b0ee
21 changed files with 195 additions and 15 deletions
@@ -110,4 +110,5 @@ require('../skins/base/views/molecules/voip/MCallAnswerTile');
 require('../skins/base/views/molecules/voip/MCallHangupTile');
 require('../skins/base/views/molecules/EventAsTextTile');
 require('../skins/base/views/molecules/MemberInfo');
+require('../skins/base/views/organisms/ErrorDialog');
 }