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

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

Conflicts:
	src/main/resources/serviceconfig/olat.properties
parents 12f3845e 9d9f4a64
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment