• Aleksandar Nikolic's avatar
    Merge tag 'OpenOLAT_18.0.4' into OpenOLAT_18.0.uibk · 12fdeec6
    Aleksandar Nikolic authored
    no-jira: set version 18.0.4
    
     Conflicts:
    	.gitignore
    	src/main/java/org/olat/core/commons/fullWebApp/_content/main_3cols.html
    	src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties
    	src/main/webapp/static/themes/light/content.css
    	src/main/webapp/static/themes/light/content.css.map
    	src/main/webapp/static/themes/light/theme.css
    	src/main/webapp/static/themes/light/theme.css.map
    	src/main/webapp/static/themes/openolat/content.css
    	src/main/webapp/static/themes/openolat/content.css.map
    	src/main/webapp/static/themes/openolat/theme.css
    	src/main/webapp/static/themes/openolat/theme.css.map
    12fdeec6