Michael Hoennig
|
0ab09f7610
|
Merge remote-tracking branch 'origin/master' into real-and-rbac-entities-everywhere
# Conflicts:
# src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemEntity.java
# src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemEntityUnitTest.java
# src/test/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRepositoryIntegrationTest.java
# src/test/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRepositoryIntegrationTest.java
# src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java
# src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRbacRepositoryIntegrationTest.java
# src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
|
2024-08-19 12:09:57 +02:00 |
|