Fisheye: Diff - lams-github/lams_tool_scratchie/web/pages/learning/scratchies.jsp

Tree
Options

2e61eef

LDEV-5002 Add question Etherpads in Scratchie

13 Apr 20 Marcin Cieslak 2e61eefa786c0411376091c504812a8931395186

Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
lams_tool_scratchie/web/pages/learning/scratchies.jsp

12 Mar 20 Marcin Cieslak 1268ec552ee72a22db3a5df680d46de7db79e0c0

Loading ...