Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2 (43c47ecb) · 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

43c47ecb

"...git@git.uibk.ac.at:c102348/olat-ci-cd-testing-project.git" did not exist on "805df7a8ffba63549df1183bd4e4f9167c83a664"

Commit 43c47ecb authored 5 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

parents 4f84a765 5edf9e8b

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/gui/media/ServletUtil.java 19 additions, 17 deletions

src/main/java/org/olat/core/gui/media/ServletUtil.java
src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java 8 additions, 2 deletions

...i21/ui/editor/AssessmentTestFeedbackEditorController.java

with 27 additions and 19 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