Skip to content
Snippets Groups Projects
  • uhensler's avatar
    9ad0c7e6
    Merge branch 'OpenOLAT_14.2' into OpenOLAT_15.0 · 9ad0c7e6
    uhensler authored
    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
    9ad0c7e6
    History
    Merge branch 'OpenOLAT_14.2' into OpenOLAT_15.0
    uhensler authored
    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
Code owners
Assign users and groups as approvers for specific file changes. Learn more.