summaryrefslogtreecommitdiffstats
path: root/web/react/pages
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-07-28 18:01:10 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-07-28 18:01:10 +0500
commit5d77ff4bcde3496554551701438c1f42550e58b3 (patch)
treeb5ae06798661167b07286d381199c5de2004f300 /web/react/pages
parent3dd541d3e09b99c60b892c37419dfa30b10700c7 (diff)
parent3a297135372c288b11c75acf6100d97c35c9dae3 (diff)
downloadchat-5d77ff4bcde3496554551701438c1f42550e58b3.tar.gz
chat-5d77ff4bcde3496554551701438c1f42550e58b3.tar.bz2
chat-5d77ff4bcde3496554551701438c1f42550e58b3.zip
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'web/react/pages')
-rw-r--r--web/react/pages/channel.jsx6
1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index cc78df120..90d90b29f 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -34,6 +34,7 @@ var MentionList = require('../components/mention_list.jsx');
var ChannelInfoModal = require('../components/channel_info_modal.jsx');
var AccessHistoryModal = require('../components/access_history_modal.jsx');
var ActivityLogModal = require('../components/activity_log_modal.jsx');
+var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx')
var Constants = require('../utils/constants.jsx');
@@ -217,4 +218,9 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
document.getElementById('activity_log_modal')
);
+ React.render(
+ <RemovedFromChannelModal />,
+ document.getElementById('removed_from_channel_modal')
+ );
+
};