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

This commit is contained in:
Weblate 2017-10-14 22:41:36 +00:00
commit 463e17b223

View file

@ -34,7 +34,7 @@ const ROOM_COLORS = [
["#dad658", "#f5f4ea"],
["#80c553", "#eef5ea"],
["#bb814e", "#eee8e3"],
["#595959", "#ececec"],
//["#595959", "#ececec"], // Grey makes everything appear disabled, so remove it for now
];
module.exports = React.createClass({