Merge with f82dce8ce23a9dd32257a8e3d917166619a4cedd (004c6fa5) · 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

004c6fa5

Commit 004c6fa5 authored 8 years ago by srosse

Downloads
- Plain Diff

Merge with f82dce8ce23a9dd32257a8e3d917166619a4cedd

parents e2dbd49b 0949c1fe

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/video/ui/TranscodingQueueTableRow.java 3 additions, 3 deletions

...a/org/olat/modules/video/ui/TranscodingQueueTableRow.java
src/main/java/org/olat/modules/video/ui/VideoAdminErrorController.java 8 additions, 5 deletions

.../org/olat/modules/video/ui/VideoAdminErrorController.java
src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...rg/olat/modules/video/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties 2 additions, 2 deletions

...rg/olat/modules/video/ui/_i18n/LocalStrings_en.properties

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