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

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

Conflicts:
	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 b51e1ab8 e8b7a745
No related branches found
No related tags 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