Fisheye: Diff - lams-github/lams_tool_laqa/web/learning/AnswersContent.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_admin/conf/language/lams/ApplicationResources.properties
lams_tool_assessment/conf/language/lams/ApplicationResources.properties
lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_lamc/conf/language/lams/ApplicationResources.properties
lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
lams_tool_laqa/web/learning/Notebook.jsp
lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

06 Dec 19 Marcin Cieslak 242fb55e2d8a84388c3a7eb168f86c4f4ab2437b

Loading ...