hs.hsadmin.ng/src/main
Michael Hoennig e422db9081 Merge remote-tracking branch 'origin/master' into remove-direct-partner-person-and-contact
# Conflicts:
#	src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java
#	src/main/resources/db/changelog/050-rbac-base.sql
#	src/main/resources/db/changelog/058-rbac-generators.sql
#	src/main/resources/db/changelog/113-test-customer-rbac.sql
#	src/main/resources/db/changelog/123-test-package-rbac.sql
#	src/main/resources/db/changelog/133-test-domain-rbac.sql
#	src/main/resources/db/changelog/203-hs-office-contact-rbac.sql
#	src/main/resources/db/changelog/213-hs-office-person-rbac.sql
#	src/main/resources/db/changelog/223-hs-office-relationship-rbac.md
#	src/main/resources/db/changelog/223-hs-office-relationship-rbac.sql
#	src/main/resources/db/changelog/233-hs-office-partner-rbac.sql
#	src/main/resources/db/changelog/243-hs-office-bankaccount-rbac.md
#	src/main/resources/db/changelog/243-hs-office-bankaccount-rbac.sql
#	src/main/resources/db/changelog/253-hs-office-sepamandate-rbac.sql
#	src/main/resources/db/changelog/273-hs-office-debitor-rbac.sql
#	src/main/resources/db/changelog/303-hs-office-membership-rbac.sql
#	src/test/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/relationship/HsOfficeRelationshipRepositoryIntegrationTest.java
2024-03-11 12:57:32 +01:00
..
java/net/hostsharing/hsadminng Merge remote-tracking branch 'origin/master' into remove-direct-partner-person-and-contact 2024-03-11 12:57:32 +01:00
resources Merge remote-tracking branch 'origin/master' into remove-direct-partner-person-and-contact 2024-03-11 12:57:32 +01:00