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

dd30dbae

Commit dd30dbae authored 5 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2'

parents 83aa1ff4 54b1b5c9

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/core/gui/components/image/ImageComponent.java 2 additions, 0 deletions

...va/org/olat/core/gui/components/image/ImageComponent.java
src/main/java/org/olat/modules/video/VideoModule.java 14 additions, 12 deletions

src/main/java/org/olat/modules/video/VideoModule.java
src/main/java/org/olat/modules/video/ui/VideoDisplayController.java 17 additions, 5 deletions

...ava/org/olat/modules/video/ui/VideoDisplayController.java
src/main/java/org/olat/modules/video/ui/question/QuestionConfigurationController.java 7 additions, 2 deletions

...es/video/ui/question/QuestionConfigurationController.java

with 40 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