Skip to content
Snippets Groups Projects
Commit f427c2be authored by User expired's avatar User expired
Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk

 Conflicts:
	src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.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
parents 7a715dbc cbccc352
No related branches found
No related tags found
Loading
Showing
with 170 additions and 139 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment