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

Tree
Options

ef06ef8

Merge branch 'LDEV-5428' into v4.8

17 Jan 24 Andrey Balan ef06ef8b2241d001150ff320dc5637eec903894d

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

Loading ...