Merge branch 'develop' into luke/groups-are-communities

2017-10-16 17:34:06 +01:00 · 2017-10-16 17:34:06 +01:00 · 0c34e943fb
commit 0c34e943fb
parent eaa5dd5f22 760b3cc60a
38 changed files with 642 additions and 58 deletions
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@ -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({