Merge remote-tracking branch 'origin/OpenOLAT_15.3' (f419d72d) · Commits · Zentraler Informatikdienst / Digitale Medien und Lerntechnologien / olat / openolat · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openolat
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

Admin message

Please note that we will be performing maintenance on our GitLab instance today, starting at 16:00h. Please plan your work accordingly. Thank you for understanding.

f419d72d

Commit f419d72d authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_15.3'

parents c64efa05 7b618cbd

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../org/olat/core/util/mail/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

.../org/olat/core/util/mail/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/export/CourseExportMediaResource.java 2 additions, 0 deletions

...ava/org/olat/course/export/CourseExportMediaResource.java
src/main/java/org/olat/course/nodes/BCCourseNode.java 1 addition, 1 deletion

src/main/java/org/olat/course/nodes/BCCourseNode.java
src/main/java/org/olat/registration/RequestAccountDeletionController.java 1 addition, 1 deletion

...g/olat/registration/RequestAccountDeletionController.java
src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...va/org/olat/registration/_i18n/LocalStrings_de.properties
src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...va/org/olat/registration/_i18n/LocalStrings_en.properties
src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java 0 additions, 10 deletions

src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java

with 8 additions and 14 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