Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (3612041a) · 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

3612041a

Commit 3612041a authored 5 years ago by srosse

Downloads
- Plain Diff

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents 1f22e138 3703d01d

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/editor/EditorMainController.java 4 additions, 0 deletions

...ain/java/org/olat/course/editor/EditorMainController.java
src/main/java/org/olat/course/editor/_content/index.html 6 additions, 2 deletions

src/main/java/org/olat/course/editor/_content/index.html
src/main/java/org/olat/course/editor/_i18n/LocalStrings_de.properties 3 additions, 2 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_fr.properties 0 additions, 1 deletion

...a/org/olat/course/editor/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_it.properties 1 addition, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...rg/olat/course/editor/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties 8 additions, 8 deletions

.../olat/modules/lecture/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...java/org/olat/repository/_i18n/LocalStrings_en.properties
src/main/java/org/olat/resource/accesscontrol/provider/paypalcheckout/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...ovider/paypalcheckout/ui/_i18n/LocalStrings_de.properties

with 27 additions and 16 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