Fisheye: Diff - lams-github/lams_tool_lamc/web/learning/AnswersContent.jsp

Tree
Options

02ce40b

Merge remote-tracking branch 'origin/develop' into LDEV-4745
Conflicts:
lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
lams_tool_assessment/web/pages/learning/learning.jsp
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.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/web/pages/learning/learning.jsp

19 Nov 19 Marcin Cieslak 02ce40b60524aa33d326fbda824dcd43f566ab94

9ca39ed

LDEV-4818 Add title property to MCQ questions

15 May 19 Andrey Balan 9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44

Loading ...