-
Nikolai Voitsehhovski authored
Merge in CONSENT/organisation from feature/NT-497 to develop Squashed commit of the following: commit 240df8efd8f673c3773e593b0d6514b021dd3336 Merge: 4b0c901 d93ec34 Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Mon Oct 17 17:49:47 2022 +0300 Merge branch 'jhipster_upgrade' into feature/NT-497 # Conflicts: # .yo-rc.json # README.md # build.gradle # checkstyle.xml # gradle.properties # gradle/war.gradle # gradle/wrapper/gradle-wrapper.jar # gradle/wrapper/gradle-wrapper.properties # gradlew # settings.gradle # sonar-project.properties # src/main/docker/app.yml # src/main/docker/monitoring.yml # src/main/docker/postgresql.yml # src/main/docker/sonar.yml # src/main/java/ee/ria/consentmanagement/DataProviderApp.java # src/main/java/ee/ria/consentmanagement/aop/logging/LoggingAspect.java # src/main/java/ee/ria/consentmanagement/client/UserFeign...
3c5bdee9