Merge branch 'develop' into matthew/dharma
This commit is contained in:
commit
9783b6100d
211 changed files with 10766 additions and 4710 deletions
|
@ -101,6 +101,7 @@ $voip-accept-color: #80f480;
|
|||
$rte-bg-color: #e9e9e9;
|
||||
$rte-code-bg-color: rgba(0, 0, 0, 0.04);
|
||||
$rte-room-pill-color: #aaa;
|
||||
$rte-group-pill-color: #aaa;
|
||||
|
||||
$topleftmenu-color: $primary-fg-color;
|
||||
$roomheader-color: $primary-fg-color;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue