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

Tree
Options

3f64433

LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

21 Jan 20 Andrey Balan 3f64433c4c8241c2ecccac71a380267db16b7ea9

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

Loading ...