Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk (d2f88bd3) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

d2f88bd3

Commit d2f88bd3 authored 4 years ago by User expired

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk

parents 8cf55b00 a411d476

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/adobeconnect/AdobeConnectModule.java 19 additions, 0 deletions

...ava/org/olat/modules/adobeconnect/AdobeConnectModule.java
src/main/java/org/olat/modules/adobeconnect/manager/AbstractAdobeConnectProvider.java 8 additions, 4 deletions

...es/adobeconnect/manager/AbstractAdobeConnectProvider.java
src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java 19 additions, 1 deletion

...a/org/olat/modules/bigbluebutton/BigBlueButtonModule.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonManagerImpl.java 14 additions, 1 deletion

...dules/bigbluebutton/manager/BigBlueButtonManagerImpl.java
src/main/java/org/olat/modules/gotomeeting/GoToMeetingModule.java 18 additions, 1 deletion

.../java/org/olat/modules/gotomeeting/GoToMeetingModule.java
src/main/java/org/olat/modules/gotomeeting/manager/GoToMeetingManagerImpl.java 38 additions, 27 deletions

...t/modules/gotomeeting/manager/GoToMeetingManagerImpl.java
src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsManagerImpl.java 8 additions, 1 deletion

...modules/openmeetings/manager/OpenMeetingsManagerImpl.java
src/main/resources/serviceconfig/olat.properties 5 additions, 0 deletions

src/main/resources/serviceconfig/olat.properties

with 129 additions and 35 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 sign in to comment