lams-github

Clone
Marcin Cieslak
committed
1268ec5
on 12 Mar 20
Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model… Show more
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

        lams_tool_scratchie/web/pages/learning/scratchies.jsp

Show less