lams-github

Clone
Marcin Cieslak
committed
0b1d534
on 28 Jan 24
Merge remote-tracking branch 'origin/v4.7' into v4.8
# Conflicts:
# lams_tool_assessment/web/pages/learning/learning.jsp
# lams_tool_assessm… Show more
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

#       lams_tool_assessment/web/pages/learning/learning.jsp

#       lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

#       lams_tool_lamc/web/learning/AnswersContent.jsp

#       lams_tool_laqa/web/learning/AnswersContent.jsp

#       lams_tool_scratchie/web/pages/learning/learning.jsp

Show less