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

1e8aad64

Commit 1e8aad64 authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_13.1'

parents b4bf1564 e4c6f915

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/org/olat/course/nodes/en/EnrollmentManager.java 4 additions, 2 deletions

...main/java/org/olat/course/nodes/en/EnrollmentManager.java
src/main/java/org/olat/ims/qti21/ui/_content/assessment_results.html 8 additions, 0 deletions

...va/org/olat/ims/qti21/ui/_content/assessment_results.html
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmatheditor/plugin.js 2 additions, 1 deletion

...atic/js/tinymce4/tinymce/plugins/olatmatheditor/plugin.js
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmatheditor/plugin.min.js 1 addition, 1 deletion

.../js/tinymce4/tinymce/plugins/olatmatheditor/plugin.min.js

with 16 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