lams-github / lams_tool_assessment / conf / language / lams

ApplicationResources.properties

Tree
Options

0586f10

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

28 Feb 23 Marcin Cieslak 0586f1081f3b7e5b550da93b64463175ea698c28

8a7a259

Merge remote-tracking branch 'origin/v4.6' into v4.7
Conflicts:
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

27 Feb 23 Marcin Cieslak 8a7a259deba12163c46440a712e41bde926fdaf8

Loading ...