Merge remote-tracking branch 'origin/master' into real-and-rbac-entities-everywhere

Browse Source

# 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

...

This commit is contained in:

Michael Hoennig 2024-08-19 12:09:57 +02:00

parent aa342d5dea 2138b3eed0

commit 0ab09f7610

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