Merge remote-tracking branch 'origin/develop' into develop

src/components/views/auth/VectorAuthFooter.js

@@ -19,7 +19,6 @@ limitations under the License.
 
 const React = require('react');
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import SettingsStore from 'matrix-react-sdk/lib/settings/SettingsStore';
 
 module.exports = React.createClass({
     displayName: 'VectorAuthFooter',
@@ -28,10 +27,6 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        // FIXME: replace this with a proper Status skin
-        // ...except then we wouldn't be able to switch to the Status theme at runtime.
-        if (SettingsStore.getValue("theme") === 'status') return <div />;
-
         return (
             <div className="mx_AuthFooter">
                 <a href="https://medium.com/@RiotChat" target="_blank" rel="noopener">blog</a>

src/vector/index.js

@@ -281,7 +281,7 @@ async function loadApp() {
 
     // as quickly as we possibly can, set a default theme...
     let a;
-    const theme = "dharma";//SettingsStore.getValue("theme");
+    const theme = SettingsStore.getValue("theme");
     for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
         const href = a.getAttribute("href");
         if (!href) continue;