Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 (052b78ee) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

052b78ee

Commit 052b78ee authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0

parents 5184d06f 52b9944c

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/ims/qti21/QTI21Service.java 11 additions, 0 deletions

src/main/java/org/olat/ims/qti21/QTI21Service.java
src/main/java/org/olat/ims/qti21/manager/QTI21ServiceImpl.java 9 additions, 1 deletion

...ain/java/org/olat/ims/qti21/manager/QTI21ServiceImpl.java
src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java 26 additions, 0 deletions

...rg/olat/ims/qti21/ui/AssessmentTestDisplayController.java
src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

.../modules/adobeconnect/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
src/main/resources/infinispan-config.xml 18 additions, 0 deletions

src/main/resources/infinispan-config.xml

with 67 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment