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

fe565494

Commit fe565494 authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5'

parents 6f7785a0 0615a3f2

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/org/olat/core/util/StringHelper.java 3 additions, 3 deletions

src/main/java/org/olat/core/util/StringHelper.java
src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java 0 additions, 2 deletions

...ava/org/olat/modules/webFeed/manager/FeedManagerImpl.java
src/main/webapp/static/js/jquery/qti/jquery.match_dnd.js 23 additions, 8 deletions

src/main/webapp/static/js/jquery/qti/jquery.match_dnd.js
src/main/webapp/static/js/jquery/qti/jquery.qti.min.js 1 addition, 1 deletion

src/main/webapp/static/js/jquery/qti/jquery.qti.min.js
src/test/java/org/olat/core/util/StringHelperTest.java 4 additions, 4 deletions

src/test/java/org/olat/core/util/StringHelperTest.java

with 32 additions and 19 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