lams-github

Clone
Marcin Cieslak
committed
a34930f
on 31 Dec 19
Merge remote-tracking branch 'origin/develop' into LDEV-4745
Conflicts:
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie… Show more
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

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

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

Show less