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

This commit is contained in:
Weblate 2017-11-27 18:07:14 +00:00
commit 293f17a710

View file

@ -891,7 +891,7 @@ module.exports = React.createClass({
*/ */
_onSetTheme: function(theme) { _onSetTheme: function(theme) {
if (!theme) { if (!theme) {
theme = SettingsStore.getValueAt(SettingLevel.DEFAULT, "theme"); theme = SettingsStore.getValue("theme");
} }
// look for the stylesheet elements. // look for the stylesheet elements.