Skip to content
Snippets Groups Projects
Commit 056846e9 authored by uhensler's avatar uhensler
Browse files

Merge branch 'OpenOLAT_14.2'

Conflicts:
	src/main/resources/serviceconfig/olat.properties
parents cd118795 13328223
No related merge requests found
Showing
with 461 additions and 5 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 to comment