lams-github

Clone
Marcin Cieslak
committed
9f4d4f1
on 22 Oct 19
Merge branch 'LDEV-4745' into v4.0
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
lams_tool_asses… Show more
Merge branch 'LDEV-4745' into v4.0

Conflicts:

        lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

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

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

Show less