Skip to content
Snippets Groups Projects
user avatar
uhensler authored
Merge branch 'OpenOLAT_14.2' of ssh://uhensler@office.frentix.com/home/uhensler/repositories/OpenOLAT.git

Conflicts:
	src/main/resources/serviceconfig/olat.properties
	src/main/webapp/static/themes/openolat/theme.css
	src/main/webapp/static/themes/openolat/theme.css.map
108eff0b
History
Name Last commit Last update