Fisheye: Diff - lams-github/lams_tool_laqa/web/learning/Notebook.jsp

Tree
Options

242fb55

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

86c25c8

LDEV-4841 Migrate Q&A tool to QB

05 Sep 19 Andrey Balan 86c25c80d92701a94c3161575c76c363891402ad

Loading ...