lams-github

Clone
Marcin Cieslak
committed
3c3e6d0
on 11 May 20
Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
l… Show more
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

        lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

        lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp

        lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

Show less