lams-github / lams_tool_zoom / conf / language / lams

ApplicationResources.properties

Tree
Options

ecb0e8d

Merge remote-tracking branch 'origin/master' into v4.0

23 Apr 20 Marcin Cieslak ecb0e8d663835186f1b63ac30d225c9700c7d79d

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

Loading ...