Fisheye: Diff - lams-github/idea

Tree
Options

5bc8817

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

399094f

LDEV-5386 Add proper name to the project

18 Apr 23 Marcin Cieslak 399094fd7734e7d5bed9bd9a40ca4a463ff02b35

Loading ...