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

a679db70

Commit a679db70 authored 6 years ago by srosse

Downloads
- Plain Diff

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

parents c5a80d8f 8b6ae25d

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/util/openxml/HTMLToOpenXMLHandler.java 9 additions, 5 deletions

...java/org/olat/core/util/openxml/HTMLToOpenXMLHandler.java
src/main/java/org/olat/core/util/openxml/OpenXMLDocument.java 1 addition, 1 deletion

...main/java/org/olat/core/util/openxml/OpenXMLDocument.java
src/main/java/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java 7 additions, 13 deletions

...a/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java
src/main/java/org/olat/repository/ui/admin/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

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

...olat/repository/ui/admin/_i18n/LocalStrings_en.properties
src/main/java/org/olat/repository/ui/admin/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...olat/repository/ui/admin/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/repository/ui/admin/_i18n/LocalStrings_it.properties 0 additions, 1 deletion

...olat/repository/ui/admin/_i18n/LocalStrings_it.properties
src/main/java/org/olat/repository/ui/admin/_i18n/LocalStrings_pt_BR.properties 0 additions, 1 deletion

...t/repository/ui/admin/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/repository/ui/admin/_i18n/LocalStrings_zh_CN.properties 0 additions, 1 deletion

...t/repository/ui/admin/_i18n/LocalStrings_zh_CN.properties

with 20 additions and 25 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