Merge remote-tracking branch 'origin/OpenOLAT_14.2' (398c483e) · 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

398c483e

Commit 398c483e authored 4 years ago by srosse

Downloads
- Plain Diff

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

parents 04f0f6f4 1366069b

No related branches found

No related tags found

Loading

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/ui/_i18n/LocalStrings_fr.properties 5 additions, 1 deletion

.../doceditor/onlyoffice/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/services/doceditor/ui/_i18n/LocalStrings_fr.properties 10 additions, 1 deletion

...ns/services/doceditor/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties 14 additions, 1 deletion

...modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

...olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties 4 additions, 1 deletion

...olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties
src/main/webapp/static/themes/light/modules/_tree.scss 35 additions, 32 deletions

src/main/webapp/static/themes/light/modules/_tree.scss
src/main/webapp/static/themes/light/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css
src/main/webapp/static/themes/light/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css.map
src/main/webapp/static/themes/openolat/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/theme.css
src/main/webapp/static/themes/openolat/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/theme.css.map

with 77 additions and 44 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