Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.0 (7989312b) · 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

7989312b

Commit 7989312b authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.0

parents be9f558c 2d68d451

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/modules/qpool/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_it.properties 1 addition, 0 deletions

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties 1 addition, 0 deletions

...olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties
src/main/java/org/olat/modules/qpool/ui/metadata/MetaUIFactory.java 3 additions, 3 deletions

...ava/org/olat/modules/qpool/ui/metadata/MetaUIFactory.java
src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataEditController.java 3 additions, 2 deletions

...les/qpool/ui/metadata/QuestionMetadataEditController.java

with 12 additions and 5 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