lams-github

Clone
Marcin Cieslak
committed
5ac2673
on 29 Dec 23
Merge remote-tracking branch 'origin/v4.7' into v4.8
# Conflicts:
# lams_common/db/sql/insert_lams_config_data.sql
# lams_tool_assessment/co… Show more
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

#       lams_common/db/sql/insert_lams_config_data.sql

#       lams_tool_assessment/conf/language/lams/ApplicationResources.properties

#       lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

#       lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Merge remote-tracking branch 'origin/LDEV-5397' into v4.8

Show less