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

08d57212

Commit 08d57212 authored 5 years ago by uhensler

Downloads
- Plain Diff

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

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

parents 5b9afdb5 89eff346

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/quality/analysis/QualityAnalysisService.java 0 additions, 3 deletions

...olat/modules/quality/analysis/QualityAnalysisService.java
src/main/java/org/olat/modules/quality/analysis/manager/QualityAnalysisServiceImpl.java 0 additions, 14 deletions

.../quality/analysis/manager/QualityAnalysisServiceImpl.java
src/main/java/org/olat/modules/quality/analysis/manager/StatisticsCalculator.java 11 additions, 0 deletions

...odules/quality/analysis/manager/StatisticsCalculator.java

with 11 additions and 17 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