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

4342e2fa

Commit 4342e2fa authored 4 years ago by srosse

Downloads
- Plain Diff

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

parents b691377a 7ed6b882

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/sysinfo/SysinfoController.java 15 additions, 8 deletions

src/main/java/org/olat/admin/sysinfo/SysinfoController.java
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/sysinfo/manager/SessionStatsManager.java 14 additions, 1 deletion

...a/org/olat/admin/sysinfo/manager/SessionStatsManager.java
src/main/java/org/olat/core/gui/media/ServletUtil.java 17 additions, 8 deletions

src/main/java/org/olat/core/gui/media/ServletUtil.java
src/main/java/org/olat/ims/qti21/ui/components/_content/textEntryInteraction.html 1 addition, 1 deletion

...ms/qti21/ui/components/_content/textEntryInteraction.html

with 49 additions and 18 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