lams-github / lams_tool_scratchie / conf / language / lams

ApplicationResources.properties

Tree
Options

3c3e6d0

Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

11 May 20 Marcin Cieslak 3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4

bcc43af

LDEV-5002 changes in labels

01 May 20 Ernie Ghiglione bcc43af1123a6ca42c3caa1d366507a4dc57c93f

Loading ...