Merge remote-tracking branch 'origin/OpenOLAT_12.5' (1f21888f) · 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

1f21888f

Commit 1f21888f authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5'

parents d83a6228 12dd4682

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...lat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...lat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/portfolio/ui/shared/SharedPagesController.java 5 additions, 0 deletions

...at/modules/portfolio/ui/shared/SharedPagesController.java
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_de.properties
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_en.properties

with 9 additions and 0 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