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

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 

Conflicts:
	src/main/java/org/olat/modules/wiki/WikiMainController.java
	src/main/webapp/static/themes/light/theme.css
	src/main/webapp/static/themes/light/theme.css.map
	src/main/webapp/static/themes/openolat/theme.css
	src/main/webapp/static/themes/openolat/theme.css.map
parents cb4d43f0 c2e16e48
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 9 deletions
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