[midPoint-git] [Evolveum/midpoint] cc6688: initial import data folder cleanup

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: cc6688a77ad91da81fdd213fb7da74f4573d8a69
      https://github.com/Evolveum/midpoint/commit/cc6688a77ad91da81fdd213fb7da74f4573d8a69
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-11 (Mon, 11 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java

  Log Message:
  -----------
  initial import data folder cleanup


  Commit: 29d88df174bc876bad551f5167f3d936756fb604
      https://github.com/Evolveum/midpoint/commit/29d88df174bc876bad551f5167f3d936756fb604
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-12-11 (Mon, 11 Dec 2017)

  Changed paths:
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

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


Compare: https://github.com/Evolveum/midpoint/compare/36b937ef58eb...29d88df174bc