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

Tree
Options

1268ec5

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

e70d228

LDEV-4921 Fix ordering for burning question in Scratchie learner

13 Dec 19 Marcin Cieslak e70d22896bf0c9b2de87b20738b0c8c749fd3bf7

Loading ...