Merge branch 'develop' into dbkr/deactivate_account

This commit is contained in:
David Baker 2016-08-03 17:52:18 +01:00
commit 498ad7fa4c
16 changed files with 346 additions and 142 deletions

View file

@ -25,6 +25,7 @@ limitations under the License.
*/
module.exports.components = {};
module.exports.components['structures.ContextualMenu'] = require('./components/structures/ContextualMenu');
module.exports.components['structures.CreateRoom'] = require('./components/structures/CreateRoom');
module.exports.components['structures.MatrixChat'] = require('./components/structures/MatrixChat');
module.exports.components['structures.MessagePanel'] = require('./components/structures/MessagePanel');