Skip to content
Snippets Groups Projects
Commit 975ecf79 authored by OZGCloud's avatar OZGCloud
Browse files

Merge remote-tracking branch 'origin/release'

# Conflicts:
#	goofy-client/apps/goofy-e2e/docker-compose.yml
#	goofy-client/apps/goofy-e2e/src/integration/main-tests/app/buildinfo.e2e-spec.ts
#	goofy-client/apps/goofy-e2e/src/integration/main-tests/app/login-logout.e2e-spec.ts
#	goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar/kommentar.e2e-spec.ts
#	goofy-client/apps/goofy-e2e/src/integration/main-tests/user-profile/user-profile-icon-assign-unassign.e2e-spec.ts
#	goofy-client/apps/goofy-e2e/src/integration/main-tests/user-profile/user-profile-icon-in-postfach-nachricht-error.e2e-spec.ts
#	goofy-client/apps/goofy-e2e/src/integration/main-tests/user-profile/user-profile-icon-in-vorgang-error.e2e-spec.ts
#	goofy-client/apps/goofy-e2e/src/page-objects/header.po.ts
#	goofy-client/libs/binary-file-shared/src/index.ts
#	goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-postfach-nachricht/historie-item-postfach-nachricht.component.html
#	goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-postfach-nachricht/historie-item-postfach-nachricht.component.scss
#	goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
#	goofy-client/libs/navigation/src/lib/navigation-container/navigation-container.component.scss
#	goofy-client/libs/navigation/src/test-setup.ts
#	goofy-client/libs/postfach-shared/src/index.ts
#	goofy-client/libs/postfach-shared/src/lib/postfach.facade.spec.ts
#	goofy-client/libs/postfach-shared/src/lib/postfach.facade.ts
#	goofy-client/libs/postfach-shared/src/lib/postfach.reducer.spec.ts
#	goofy-client/libs/postfach-shared/src/lib/postfach.reducer.ts
#	goofy-client/libs/postfach-shared/src/lib/postfach.util.spec.ts
#	goofy-client/libs/postfach-shared/src/lib/postfach.util.ts
#	goofy-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail-list.component.html
#	goofy-client/libs/postfach/src/test-setup.ts
#	goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html
#	goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.ts
#	goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts
#	goofy-client/pom.xml
#	goofy-server/pom.xml
#	goofy-server/src/main/java/de/itvsh/goofy/LocalDateDeserializer.java
#	goofy-server/src/main/java/de/itvsh/goofy/LocalDateSerializer.java
#	goofy-server/src/main/java/de/itvsh/goofy/common/user/GoofyUser.java
#	goofy-server/src/main/java/de/itvsh/goofy/common/user/InternalUserIdService.java
#	goofy-server/src/test/java/de/itvsh/goofy/common/user/GoofyUserTestFactory.java
#	goofy-server/src/test/java/de/itvsh/goofy/common/user/InternalUserIdServiceTest.java
#	goofy-server/src/test/java/de/itvsh/goofy/common/user/UserTestFactory.java
#	goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcClientAttributeTestFactory.java
#	goofy-server/src/test/resources/application.yml
#	pom.xml
parents 967a698e f69d7abe
No related branches found
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment