Merge branch 'staging' into 'project-admin'
# Conflicts: # src/menu-left.pug
Showing
- src/page-circle-edit.pug 27 additions, 27 deletionssrc/page-circle-edit.pug
- src/page-circle-profile.pug 1 addition, 1 deletionsrc/page-circle-profile.pug
- src/styles/abstracts/_variables.scss 2 additions, 0 deletionssrc/styles/abstracts/_variables.scss
- src/styles/base/main.scss 6 additions, 7 deletionssrc/styles/base/main.scss
- src/styles/base/menu-left.scss 41 additions, 16 deletionssrc/styles/base/menu-left.scss
Loading
Please register or sign in to comment