Michael Hoennig 823725f57d Merge remote-tracking branch 'origin/master' into introduce-separate-database-schema-test-and-amend-generators ... # Conflicts: # src/test/java/net/hostsharing/hsadminng/hs/migration/BaseOfficeDataImport.java		2024-09-16 15:37:33 +02:00
..
java/net/hostsharing/hsadminng	Merge remote-tracking branch 'origin/master' into introduce-separate-database-schema-test-and-amend-generators	2024-09-16 15:37:33 +02:00
resources	use schema rbactest (just hardcoded, not yet generated)	2024-09-16 13:19:56 +02:00