Clone
Marcin Cieslak
committed
on 20 Mar 20
Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.j… Show more
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

        lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

        lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Show less