Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk (fd775a76) · 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

fd775a76

Commit fd775a76 authored 4 years ago by User expired

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk

parents a6bb9861 b97ee237

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...org/olat/course/nodes/bc/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...org/olat/course/nodes/bc/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_fr.properties 0 additions, 1 deletion

...org/olat/course/nodes/bc/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_it.properties 0 additions, 1 deletion

...org/olat/course/nodes/bc/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_pt_BR.properties 0 additions, 1 deletion

.../olat/course/nodes/bc/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
src/main/resources/serviceconfig/olat.properties 2 additions, 2 deletions

src/main/resources/serviceconfig/olat.properties
src/main/webapp/static/js/functions.js 3 additions, 1 deletion

src/main/webapp/static/js/functions.js
src/main/webapp/static/js/js.plugins.min.js 1 addition, 1 deletion

src/main/webapp/static/js/js.plugins.min.js

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