Skip to content
Snippets Groups Projects
  • uhensler's avatar
    df501a89
    Merge branch 'master' into learning_path · df501a89
    uhensler authored
    Conflicts:
    	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_fr.properties
    	src/main/java/org/olat/course/nodes/en/EnrollmentManager.java
    	src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_fr.properties
    	src/main/java/org/olat/modules/fo/ui/MessageListController.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
    df501a89
    History
    Merge branch 'master' into learning_path
    uhensler authored
    Conflicts:
    	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_fr.properties
    	src/main/java/org/olat/course/nodes/en/EnrollmentManager.java
    	src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_fr.properties
    	src/main/java/org/olat/modules/fo/ui/MessageListController.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.