lams-github

Clone
Marcin Cieslak
committed
ef86b1a
on 10 Oct 19
Merge branch 'LDEV-4745' into LDEV-4845
Conflicts:
lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
lams_common/src… Show more
Merge branch 'LDEV-4745' into LDEV-4845

Conflicts:

        lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

        lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

Show less