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

28837f5e

Commit 28837f5e authored 6 months ago by OZGCloud

Downloads
- Plain Diff

Merge pull request 'OZG-6162-resolve-bean-conflict' (#17) from...

Merge pull request 'OZG-6162-resolve-bean-conflict' (#17) from OZG-6162-resolve-bean-conflict into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/collaboration-manager/pulls/17

Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

parents 169a03aa 89beeccd

No related branches found

No related tags found

Loading

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java 15 additions, 0 deletions

...loud/collaboration/CollaborationManagerConfiguration.java
collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java 1 addition, 0 deletions

...zgcloud/collaboration/common/user/UserProfileService.java
collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationTestApplication.java 3 additions, 0 deletions

.../ozgcloud/collaboration/CollaborationTestApplication.java

with 19 additions and 0 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