mirror of
https://github.com/element-hq/element-web
synced 2024-11-29 04:48:50 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
463e17b223
1 changed files with 1 additions and 1 deletions
|
@ -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({
|
||||
|
|
Loading…
Reference in a new issue