diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-10 15:15:04 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-10 15:15:04 -0700 |
commit | 83b04181da84d0456dfa02b8d52953eb3fd3d7d1 (patch) | |
tree | 49510d8a6d4be6aeed9a86816cffcbc82d66b09b /web/react/pages/channel.jsx | |
parent | 1108ac53063bedcfe00647fa0577e91cf60555de (diff) | |
parent | 927b474005b9e6c03f7385f4d1a06626dd0450e3 (diff) | |
download | chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.tar.gz chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.tar.bz2 chat-83b04181da84d0456dfa02b8d52953eb3fd3d7d1.zip |
merging
Diffstat (limited to 'web/react/pages/channel.jsx')
-rw-r--r-- | web/react/pages/channel.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index 71a03cde0..182721bef 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -5,7 +5,7 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); var Navbar = require('../components/navbar.jsx'); var Sidebar = require('../components/sidebar.jsx'); var ChannelHeader = require('../components/channel_header.jsx'); -var PostList = require('../components/post_list.jsx'); +var PostListContainer = require('../components/post_list_container.jsx'); var CreatePost = require('../components/create_post.jsx'); var SidebarRight = require('../components/sidebar_right.jsx'); var SidebarRightMenu = require('../components/sidebar_right_menu.jsx'); @@ -159,7 +159,7 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) { ); React.render( - <PostList />, + <PostListContainer />, document.getElementById('post-list') ); |