Merge remote-tracking branch 'origin/OpenOLAT_15.0' (19cdd4b2) · 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

19cdd4b2

Commit 19cdd4b2 authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_15.0'

parents f0466d02 832675ea

No related branches found

No related tags found

No related merge requests found

Changes 7

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
src/test/java/org/olat/repository/manager/RepositoryEntryRelationDAOTest.java 3 additions, 3 deletions

...at/repository/manager/RepositoryEntryRelationDAOTest.java

with 24 additions and 23 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