Fisheye: Diff - lams-github/idea_project/.idea/misc.xml

Tree
Options

201b2a4

LDEV-4440 Prevent course creation duplication

28 Aug 23 Marcin Cieslak 201b2a4bde67a04ad7cb2c38c916b0d3327e7d21

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 ...