uhensler
authored
ssh://uhensler@office.frentix.com/home/uhensler/repositories/OpenOLAT.git Conflicts: src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java src/main/webapp/static/themes/light/theme.css src/main/webapp/static/themes/light/theme.css.map src/main/webapp/static/themes/light/theme_ie_completions.css src/main/webapp/static/themes/openolat/theme.css src/main/webapp/static/themes/openolat/theme.css.map src/main/webapp/static/themes/openolat/theme_ie_completions.css