lams-github / lams_tool_lamc / conf / language / lams

ApplicationResources.properties

Tree
Options

05c4d93

LDEV-4745 adding missing labels to tools
Scratchie, QA, MC and assessment

07 Dec 19 Ernie Ghiglione 05c4d93efebf9e166ea006ec2f05b055b2a1ea9a

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 ...