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

This commit is contained in:
Weblate 2018-02-22 11:15:24 +00:00
commit 8b9f265f1c

View file

@ -627,8 +627,8 @@ module.exports = React.createClass({
const room = this.state.room;
if (!room) return;
const color_scheme = SettingsStore.getValue("roomColor", room.room_id);
console.log("Tinter.tint from updateTint");
const color_scheme = SettingsStore.getValue("roomColor", room.roomId);
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
},