Fisheye: Diff - lams-github/lams_monitoring/web/monitor.jsp

Tree
Options

ddd6d9e

Merge remote-tracking branch 'origin/v4.7' into v4.8
# Conflicts:
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
# lams_tool_assessment/web/pages/learning/results/allquestions.jsp
# lams_tool_assessment/web/pages/learning/results/allquestions5.jsp

16 Jan 24 Marcin Cieslak ddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b

509e81c

LDEV-5397 import bootstrap5.scss into components.scss
* Subsequently import components.scss into components-learner.scss
* It will allow using bootstrap5 CSS rules in components CSS classes

22 Nov 23 Andrey Balan 509e81cd8bc4486fab7de352c4e8cfafd38efe48

Loading ...