Merge remote-tracking branch 'origin/OpenOLAT_15.2' (9e55d7ef) · 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

9e55d7ef

Commit 9e55d7ef authored 4 years ago by srosse

Downloads
- Plain Diff

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

parents 08fb1bf7 34868495

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

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

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

src/main/java/org/olat/core/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

src/main/java/org/olat/core/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties 2 additions, 2 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java 9 additions, 3 deletions

...main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.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/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties

with 24 additions and 18 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