Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 (832675ea) · 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

Admin message

Please note that we will be performing maintenance on our GitLab instance today, starting at 16:30h. Please plan your work accordingly. Thank you for understanding.

832675ea

Commit 832675ea authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0

parents 284d6a7f c25dda2d

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

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

...es/adobeconnect/manager/AbstractAdobeConnectProvider.java
src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnect9Provider.java 1 addition, 2 deletions

...t/modules/adobeconnect/manager/AdobeConnect9Provider.java
src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnectManagerImpl.java 4 additions, 3 deletions

...modules/adobeconnect/manager/AdobeConnectManagerImpl.java
src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnectSPI.java 0 additions, 1 deletion

...rg/olat/modules/adobeconnect/manager/AdobeConnectSPI.java
src/main/java/org/olat/modules/adobeconnect/manager/DFNprovider.java 3 additions, 4 deletions

...va/org/olat/modules/adobeconnect/manager/DFNprovider.java

with 21 additions and 20 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