Merge branch 'staging' into 'parameters-on-sample-for-clients'

# Conflicts: # src/menu-left.pug
2020-01-16 19:32:55 +00:00
parent 4cf9cce6ad 7b1eab139e
commit a0cd6bb468
20 changed files with 475 additions and 126 deletions
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@ -45,7 +45,7 @@ nav#main__menu
    //-       next='project'
    //-     )
    div.divider
-    div.menu-wrapper
+    div
      div.menu
        div.menu-chevron
          sib-link(next='admin-circle-list')