Merge remote-tracking branch 'mattermost/master' into auto-updater

src/main/menus/app.js

@@ -15,11 +15,11 @@ function createTemplate(mainWindow, config, isDev) {
     type: 'separator',
   };
 
-  var appName = app.getName();
-  var firstMenuName = (process.platform === 'darwin') ? appName : 'File';
-  var template = [];
+  const appName = app.getName();
+  const firstMenuName = (process.platform === 'darwin') ? appName : 'File';
+  const template = [];
 
-  var platformAppMenu = process.platform === 'darwin' ? [{
+  let platformAppMenu = process.platform === 'darwin' ? [{
     label: 'About ' + appName,
     role: 'about',
     click() {
@@ -217,7 +217,7 @@ function createTemplate(mainWindow, config, isDev) {
     }],
   };
   template.push(windowMenu);
-  var submenu = [];
+  const submenu = [];
   if (buildConfig.helpLink) {
     submenu.push({
       label: 'Learn More...',

src/main/menus/tray.js

@@ -10,7 +10,7 @@ import settings from '../../common/settings';
 function createTemplate(mainWindow, config, isDev) {
   const settingsURL = isDev ? 'http://localhost:8080/browser/settings.html' : `file://${app.getAppPath()}/browser/settings.html`;
   const teams = settings.mergeDefaultTeams(config.teams);
-  var template = [
+  const template = [
     ...teams.slice(0, 9).map((team, i) => {
       return {
         label: team.name,