lams-github

Clone
Marcin Cieslak
committed
ac33d20
on 19 Mar 20
Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/Outcom… Show more
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

        lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java

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

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

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

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

        lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Show less