lams-github

Clone
Marcin Cieslak
committed
0586f10
on 28 Feb 23
Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_tool_assessment/conf/language/lams/ApplicationResources.properties
la… Show more
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

        lams_tool_assessment/conf/language/lams/ApplicationResources.properties

        lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

        lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

        lams_tool_assessment/web/pages/monitoring/summary.jsp

Show less