Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk
Conflicts: src/main/java/org/olat/course/nodes/livestream/manager/LiveStreamServiceImpl.java src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonMeetingController.java src/main/resources/serviceconfig/olat.properties 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
No related branches found
No related tags found
Showing
- pom.xml 1 addition, 1 deletionpom.xml
- src/main/java/org/olat/admin/_i18n/LocalStrings_ar.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_ar.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_bg.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_bg.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_cs.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_cs.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_da.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_da.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_de.properties 4 additions, 8 deletions...main/java/org/olat/admin/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_el.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_el.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_en.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_es.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_es.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_et_EE.properties 0 additions, 1 deletion...n/java/org/olat/admin/_i18n/LocalStrings_et_EE.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_fa.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_fa.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_fr.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_it.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_it.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_jp.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_jp.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_lt.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_lt.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_nl_NL.properties 0 additions, 4 deletions...n/java/org/olat/admin/_i18n/LocalStrings_nl_NL.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_pl.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_pl.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_pt_BR.properties 0 additions, 4 deletions...n/java/org/olat/admin/_i18n/LocalStrings_pt_BR.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_pt_PT.properties 0 additions, 2 deletions...n/java/org/olat/admin/_i18n/LocalStrings_pt_PT.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_ru.properties 0 additions, 4 deletions...main/java/org/olat/admin/_i18n/LocalStrings_ru.properties
Loading
Please register or sign in to comment