lams-github / lams_tool_zoom / conf / language / lams

ApplicationResources.properties

Tree
Options

1268ec5

Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.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/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
lams_tool_scratchie/web/pages/learning/scratchies.jsp

12 Mar 20 Marcin Cieslak 1268ec552ee72a22db3a5df680d46de7db79e0c0

71a5c4d

LDEV-4786 Add missing labels

06 Dec 19 Marcin Cieslak 71a5c4dcb33476a695cd426901df30c65f733c41

Loading ...