Merge branch 'master' of https://github.com/mattermost/platform into mm-1696

Conflicts:
	web/react/components/setting_upload.jsx
	web/react/components/team_import_tab.jsx

1 files changed, 3 insertions, 0 deletions

diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 3e0a66e92..06c373e5d 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -152,6 +152,8 @@ module.exports = React.createClass({
 
         var channelMenuDropdown = null;
         if (channel) {
+            var viewInfoOption = <li role='presentation'><a role='menuitem' data-toggle='modal' data-target='#channel_info' data-channelid={channel.id} href='#'>View Info</a></li>
+
             var addMembersOption = null;
             if (!isDirect && !ChannelStore.isDefault(channel)) {
                 addMembersOption = <li role='presentation'><a role='menuitem' data-toggle='modal' data-target='#channel_invite' href='#'>Add Members</a></li>;
@@ -192,6 +194,7 @@ module.exports = React.createClass({
                                                 <span className='glyphicon glyphicon-chevron-down header-dropdown__icon'></span>
                                             </a>
                                             <ul className='dropdown-menu' role='menu' aria-labelledby='channel_header_dropdown'>
+                                                {viewInfoOption}
                                                 {addMembersOption}
                                                 {manageMembersOption}
                                                 {setChannelDescriptionOption}