Michael Hoennig
|
0fd7cb119a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/use-case-acceptance-tests-4
# 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
|
2024-11-15 09:57:11 +01:00 |
|