[midPoint-git] [Evolveum/midpoint] 4be789: fixing MID-3620

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 4be7891eb3ddf434d945fae027785a11c26dbbbe
      https://github.com/Evolveum/midpoint/commit/4be7891eb3ddf434d945fae027785a11c26dbbbe
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java

  Log Message:
  -----------
  fixing MID-3620


  Commit: f63f5e96dbb98eb177c92b4e5f48023ad8f03727
      https://github.com/Evolveum/midpoint/commit/f63f5e96dbb98eb177c92b4e5f48023ad8f03727
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectValue.java

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


Compare: https://github.com/Evolveum/midpoint/compare/3b7282226154...f63f5e96dbb9