Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

collaboration-manager
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

97ec4b1d

Commit 97ec4b1d authored 5 months ago by OZGCloud

Downloads
- Plain Diff

Merge branch 'master' into OZG-7131-Erweiterung-muk-Nachricht

# Conflicts:
#	collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationService.java

parents b1851bff 039d5d9e

No related branches found

No related tags found

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationService.java 17 additions, 11 deletions

.../java/de/ozgcloud/collaboration/CollaborationService.java
collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/vorgang/ServiceKonto.java 1 addition, 0 deletions

.../java/de/ozgcloud/collaboration/vorgang/ServiceKonto.java
collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationServiceTest.java 14 additions, 14 deletions

...a/de/ozgcloud/collaboration/CollaborationServiceTest.java

with 32 additions and 25 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

Impressum - Datenschutz - Barrierefreiheit