Merge remote-tracking branch 'origin/master' into master (859c085f) · 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

859c085f

Commit 859c085f authored 4 years ago by aboeckle

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into master

parents 25a0632e eef7d339

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonAdminMeetingsController.java 4 additions, 1 deletion

...igbluebutton/ui/BigBlueButtonAdminMeetingsController.java
src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

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

.../olat/modules/lecture/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties 2 additions, 0 deletions

.../olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/lecture/ui/coach/AbsenceNoticeSearchController.java 1 addition, 0 deletions

...dules/lecture/ui/coach/AbsenceNoticeSearchController.java
src/main/java/org/olat/modules/lecture/ui/coach/AppealListSearchController.java 1 addition, 0 deletions

.../modules/lecture/ui/coach/AppealListSearchController.java

with 12 additions and 1 deletion

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