lams-github / lams_central / conf / language / lams

ApplicationResources.properties

Tree
Options

7ba9ed7

LDEV-5024 Add "question from bank" button to TBL template wizard

14 May 20 Marcin Cieslak 7ba9ed71bbc4ef9c86c6204497a65e96bed88a04

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