Merge remote-tracking branch 'origin/OpenOLAT_13.2'
Conflicts: src/main/webapp/static/themes/light/theme.css src/main/webapp/static/themes/light/theme.css.map src/main/webapp/static/themes/openolat/theme.css src/main/webapp/static/themes/openolat/theme.css.map
No related branches found
No related tags found
Showing
- src/main/webapp/static/themes/light/modules/_thirdparty.scss 9 additions, 0 deletionssrc/main/webapp/static/themes/light/modules/_thirdparty.scss
- src/main/webapp/static/themes/light/theme.css 1 addition, 1 deletionsrc/main/webapp/static/themes/light/theme.css
- src/main/webapp/static/themes/light/theme.css.map 1 addition, 1 deletionsrc/main/webapp/static/themes/light/theme.css.map
- src/main/webapp/static/themes/openolat/theme.css 1 addition, 1 deletionsrc/main/webapp/static/themes/openolat/theme.css
- src/main/webapp/static/themes/openolat/theme.css.map 1 addition, 1 deletionsrc/main/webapp/static/themes/openolat/theme.css.map
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment