Skip to content
Snippets Groups Projects
user avatar
uhensler authored
Conflicts:
	src/main/java/org/olat/course/nodes/iq/IQRunController.java
	src/main/java/org/olat/course/nodes/survey/SurveyRunController.java
	src/main/java/org/olat/course/nodes/survey/_i18n/LocalStrings_de.properties
	src/main/java/org/olat/course/nodes/survey/_i18n/LocalStrings_en.properties
	src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
	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
1b449a91
History