Merge branch 'develop' into 'fix/23980/develop'
# Fix conflicts: # src/frontend/app/app.component.ts
No related branches found
No related tags found
Showing
- src/frontend/app/pad/pad.component.html 1 addition, 1 deletionsrc/frontend/app/pad/pad.component.html
- src/frontend/app/pad/pad.component.ts 21 additions, 14 deletionssrc/frontend/app/pad/pad.component.ts
- src/frontend/app/sidebar/sidebar.component.ts 2 additions, 1 deletionsrc/frontend/app/sidebar/sidebar.component.ts
- src/frontend/core/global.scss 8 additions, 2 deletionssrc/frontend/core/global.scss
Please register or sign in to comment