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

Merge branch '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 ec484737 29f0e459
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 4 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