Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 (e4dddfb2) · 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

e4dddfb2

Commit e4dddfb2 authored 4 years ago by srosse

Downloads
- Plain Diff

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

parents d728132f 52e235e4

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/ims/qti21/model/xml/AssessmentHtmlBuilder.java 3 additions, 0 deletions

...a/org/olat/ims/qti21/model/xml/AssessmentHtmlBuilder.java
src/main/java/org/olat/modules/ceditor/ui/HTMLRawEditorController.java 1 addition, 1 deletion

.../org/olat/modules/ceditor/ui/HTMLRawEditorController.java
src/main/java/org/olat/modules/ceditor/ui/ImageRunController.java 1 addition, 3 deletions

.../java/org/olat/modules/ceditor/ui/ImageRunController.java
src/main/java/org/olat/modules/forms/ui/RubricEditorController.java 7 additions, 7 deletions

...ava/org/olat/modules/forms/ui/RubricEditorController.java

with 12 additions and 11 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