lams-github / lams_central / conf / language / lams

ApplicationResources.properties

Tree
Options

f8f156c

Merge remote-tracking branch 'origin/v4.6' into v4.7

20 Jun 23 Marcin Cieslak f8f156c0f021d60857760ea60579a41e1380288c

Merge remote-tracking branch 'origin/v4.6' into v4.7
# Conflicts:
# idea_project/.idea/runConfigurations/WildFly.xml
# lams_tool_assessment/lams_tool_assessment.eml
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

30 May 23 Marcin Cieslak 5bc88174180046cd153cfc46a0c8ef13675bd4bf

Loading ...