Merge branch 'develop' into matthew/status

This commit is contained in:
Matthew Hodgson 2017-11-03 15:11:23 +00:00
commit 923295973b
13 changed files with 142 additions and 109 deletions

View file

@ -29,7 +29,6 @@ $mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
// groups
$group-alert-color: #774f7e;
$group-my-groups-placeholder-bg: #f7f7f7;
$group-my-groups-placeholder-fg: #888;