From a58190a9355307d370d2248d275f663a61ce7d3b Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <avanmeerten@atlassian.com>
Date: Mon, 1 Aug 2016 11:26:25 -0500
Subject: [PATCH] Interface Config loaded via SSI into index.html to allow
 deployment-specific overrides even when using CDN update whitespace in
 toolbar buttons array to allow value to be more easily overridden

---
 index.html          | 2 +-
 interface_config.js | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 670ffba76..41612e6e4 100644
--- a/index.html
+++ b/index.html
@@ -12,7 +12,7 @@
     <script src="utils.js?v=1"></script>
     <!--#include virtual="connection_optimization/connection_optimization.html" -->
     <script src="connection_optimization/do_external_connect.js?v=1"></script>
-    <script src="interface_config.js?v=6"></script>
+    <script><!--#include virtual="interface_config.js" --></script>
     <script src="libs/lib-jitsi-meet.min.js?v=139"></script>
     <script src="libs/app.bundle.min.js?v=139"></script>
     <link rel="icon" type="image/png" href="/images/favicon.ico?v=1"/>
diff --git a/interface_config.js b/interface_config.js
index 9d0f05a62..e989eeaa2 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -14,10 +14,7 @@ var interfaceConfig = {
     GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
     APP_NAME: "Jitsi Meet",
     INVITATION_POWERED_BY: true,
-    TOOLBAR_BUTTONS: ['authentication', 'microphone', 'camera', 'desktop',
-        'recording', 'security', 'invite', 'chat', 'etherpad', 'sharedvideo',
-        'fullscreen', 'sip', 'dialpad', 'settings', 'hangup', 'filmstrip',
-        'contacts'],
+    TOOLBAR_BUTTONS: ['authentication', 'microphone', 'camera', 'desktop', 'recording', 'security', 'invite', 'chat', 'etherpad', 'sharedvideo', 'fullscreen', 'sip', 'dialpad', 'settings', 'hangup', 'filmstrip', 'contacts'],
     // Determines how the video would fit the screen. 'both' would fit the whole
     // screen, 'height' would fit the original video height to the height of the
     // screen, 'width' would fit the original video width to the width of the