Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk (330cb39a) · 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

330cb39a

Commit 330cb39a authored 5 years ago by User expired

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk

parents e48a7e81 d720308c

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java 18 additions, 1 deletion

...e/commons/services/vfs/ui/version/VFSTrashController.java
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
src/main/webapp/static/js/paella/player/example.html 1 addition, 1 deletion

src/main/webapp/static/js/paella/player/example.html
src/main/webapp/static/js/paella/player/index-custom.html 1 addition, 1 deletion

src/main/webapp/static/js/paella/player/index-custom.html
src/main/webapp/static/js/paella/player/index-debug.html 1 addition, 1 deletion

src/main/webapp/static/js/paella/player/index-debug.html
src/main/webapp/static/js/paella/player/index.html 1 addition, 1 deletion

src/main/webapp/static/js/paella/player/index.html

with 23 additions and 6 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