Merge branch 'OpenOLAT_13.2' (f0c64020) · 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

f0c64020

Commit f0c64020 authored 6 years ago by uhensler

Downloads
- Plain Diff

Merge branch 'OpenOLAT_13.2'

Conflicts:
	src/main/resources/serviceconfig/olat.properties

parents 6295bc69 6f532240

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java 1 addition, 1 deletion

...g/olat/admin/user/delete/service/UserDeletionManager.java
src/main/java/org/olat/modules/ceditor/ui/TableEditorController.java 2 additions, 2 deletions

...va/org/olat/modules/ceditor/ui/TableEditorController.java
src/main/java/org/olat/modules/ceditor/ui/TableRunController.java 1 addition, 0 deletions

.../java/org/olat/modules/ceditor/ui/TableRunController.java
src/main/java/org/olat/modules/portfolio/ui/BinderListController.java 6 additions, 2 deletions

...a/org/olat/modules/portfolio/ui/BinderListController.java
src/main/java/org/olat/modules/portfolio/ui/PortfolioHomeController.java 6 additions, 4 deletions

...rg/olat/modules/portfolio/ui/PortfolioHomeController.java

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