Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1 (e9f2800b) · 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

e9f2800b

Commit e9f2800b authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1

parents 93de337e 0b93e0a5

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/AdminModuleDispatcher.java 15 additions, 21 deletions

src/main/java/org/olat/admin/AdminModuleDispatcher.java
src/main/java/org/olat/core/servlets/StaticServlet.java 2 additions, 2 deletions

src/main/java/org/olat/core/servlets/StaticServlet.java
src/main/java/org/olat/modules/webFeed/dispatching/FeedMediaDispatcher.java 6 additions, 1 deletion

...olat/modules/webFeed/dispatching/FeedMediaDispatcher.java
src/main/webapp-tomcat/WEB-INF/web.xml 9 additions, 0 deletions

src/main/webapp-tomcat/WEB-INF/web.xml

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