lams-github / lams_monitoring / conf / language / lams

ApplicationResources.properties

Tree
Options

903a4f9

LDEV-5023 Allow single click gate open in monitoring

12 May 20 Marcin Cieslak 903a4f947345a9960d5af2f3a7e7ab2f366884e0

Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

20 Mar 20 Marcin Cieslak a61b6ad192148c0ae514f37a9b488c3a15535ee9

Loading ...