lams-github

Clone
Marcin Cieslak
committed
b616b4a
on 13 Apr 20
LDEV-5002 Add question Etherpads in Scratchie
Conflicts:
lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java
lams… Show more
LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

        lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

        lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

        lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag

        lams_tool_scratchie/web/pages/learning/scratchies.jsp

Show less