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

2ed1f126

Commit 2ed1f126 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 2e0d6457 ca5858d7

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/commons/calendar/ui/WeeklyCalendarController.java 11 additions, 11 deletions

...rg/olat/commons/calendar/ui/WeeklyCalendarController.java
src/main/java/org/olat/home/HomeCalendarController.java 1 addition, 1 deletion

src/main/java/org/olat/home/HomeCalendarController.java
src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java 1 addition, 2 deletions

...ules/curriculum/restapi/CurriculumElementsWebService.java
src/main/java/org/olat/repository/ui/catalog/CatalogNodeController.java 2 additions, 2 deletions

...org/olat/repository/ui/catalog/CatalogNodeController.java

with 15 additions and 16 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