[midPoint-git] [Evolveum/midpoint] 7cd226: MID-6271 fixed npm patch-package for windows platf...

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7cd226c36e18d37d1b01d77cb5c824f8f3c8fc71
      https://github.com/Evolveum/midpoint/commit/7cd226c36e18d37d1b01d77cb5c824f8f3c8fc71
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-05-13 (Fri, 13 May 2022)

  Changed paths:
    A gui/admin-gui/patches/.gitattributes

  Log Message:
  -----------
  MID-6271 fixed npm patch-package for windows platform (CRLF issue)


  Commit: 3059d6c4fc129ffa926ac769fa047c23090f5d2c
      https://github.com/Evolveum/midpoint/commit/3059d6c4fc129ffa926ac769fa047c23090f5d2c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-05-13 (Fri, 13 May 2022)

  Changed paths:
    M config/initial-objects/000-system-configuration.xml
    M gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/GenericItemMerger.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/TypeSpecificMergersConfigurator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/objdef/ResourceObjectTypeDefinitionMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/resource/ResourceMergeOperation.java
    M infra/schema/src/test/resources/diff/system-configuration-after.xml
    M infra/schema/src/test/resources/diff/system-configuration-before.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/SynchronizationSituationTest.java
    M model/report-impl/src/test/resources/common/system-configuration-safe.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M repo/repo-sql-impl-test/src/test/resources/modify/system-configuration-after.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/system-configuration-before.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/8a9ca40541ed...3059d6c4fc12