Merge remote-tracking branch 'origin/feature/RED-9472' into feature/RED-9472

Browse Source

# Conflicts:
#	buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
#	persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java
#	persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/RulesResource.java
#	persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java
#	persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java

...

This commit is contained in:

yhampe 2024-11-18 09:38:11 +01:00

parent d2380d47b2 0c1670461b

commit 7e8e081553

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