Merge remote-tracking branch 'refs/remotes/origin/master' into feature/use-case-acceptance-tests-4

Browse Source

# Conflicts:
#	src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java
#	src/main/resources/api-definition/hs-office/hs-office-coopassets-schemas.yaml
#	src/main/resources/api-definition/hs-office/hs-office-coopshares-schemas.yaml
#	src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionControllerAcceptanceTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionControllerAcceptanceTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java

...

This commit is contained in:

Michael Hoennig 2024-11-15 09:57:11 +01:00

parent a87acaacec 8f410198e9

commit 0fd7cb119a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available