Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_14.0 (46815873) · 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

46815873

Commit 46815873 authored 5 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_14.0

parents 16af482d 823d8693

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java 1 addition, 1 deletion

...rg/olat/course/nodes/iq/QTI21AssessmentRunController.java
src/main/java/org/olat/ims/qti21/ui/ResourcesMapper.java 6 additions, 4 deletions

src/main/java/org/olat/ims/qti21/ui/ResourcesMapper.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectVelocityRenderDecorator.java 1 addition, 1 deletion

...i/components/AssessmentObjectVelocityRenderDecorator.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentRenderFunctions.java 2 additions, 3 deletions

...at/ims/qti21/ui/components/AssessmentRenderFunctions.java

with 10 additions and 9 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