Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal

This commit is contained in:
2022-03-24 18:44:42 +01:00
146 changed files with 1835 additions and 1018 deletions

View File

@@ -11,3 +11,7 @@ $chill-household-context: #929d69;
$social-issue-color: #4bafe8;
$social-action-color: $orange;
$activity-color: yellowgreen;
// budget colors
$budget-resource-color: #6d9e63;
$budget-charge-color: #e03851;