Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
293f17a710
1 changed files with 1 additions and 1 deletions
|
@ -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.
|
||||||
|
|
Loading…
Reference in a new issue