Merge OpenOLAT 11.5 to OpenOLAT 12.0 with caa24d6d25943644d7c76d31f4b75620ddb5d8a6 (8e0937dc) · 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

8e0937dc

Commit 8e0937dc authored 7 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 11.5 to OpenOLAT 12.0 with caa24d6d25943644d7c76d31f4b75620ddb5d8a6

parents 5652f7a1 3b1ee915

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/util/mail/manager/MailManagerImpl.java 17 additions, 6 deletions

...java/org/olat/core/util/mail/manager/MailManagerImpl.java
src/main/java/org/olat/resource/accesscontrol/provider/free/ui/FreeAccessConfigurationController.java 2 additions, 0 deletions

...l/provider/free/ui/FreeAccessConfigurationController.java
src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/PaypalAccessConfigurationController.java 2 additions, 0 deletions

...ovider/paypal/ui/PaypalAccessConfigurationController.java
src/main/java/org/olat/resource/accesscontrol/provider/token/ui/TokenAccessConfigurationController.java 2 additions, 0 deletions

...provider/token/ui/TokenAccessConfigurationController.java
src/main/java/org/olat/resource/accesscontrol/ui/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...esource/accesscontrol/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/resource/accesscontrol/ui/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...esource/accesscontrol/ui/_i18n/LocalStrings_en.properties

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