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

c63bfbee

Commit c63bfbee authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 69f5f322 332fa8d3

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/modules/lecture/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

.../olat/modules/lecture/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/video/VideoFormat.java 13 additions, 0 deletions

src/main/java/org/olat/modules/video/VideoFormat.java
src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java 18 additions, 4 deletions

...java/org/olat/modules/video/manager/VideoManagerImpl.java
src/main/java/org/olat/modules/video/model/VideoMetaImpl.java 1 addition, 1 deletion

...main/java/org/olat/modules/video/model/VideoMetaImpl.java

with 34 additions and 7 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