[midPoint-git] [Evolveum/midpoint] 858807: fix MID-2534

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8588079c442f45862dc407315442f44a3628a5c3
      https://github.com/Evolveum/midpoint/commit/8588079c442f45862dc407315442f44a3628a5c3
  Author: honchar <honchar at evolveum.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

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

  Log Message:
  -----------
  fix MID-2534


  Commit: 459d1bbe05a2af7223a3a9792d4b7b51202821b0
      https://github.com/Evolveum/midpoint/commit/459d1bbe05a2af7223a3a9792d4b7b51202821b0
  Author: honchar <honchar at evolveum.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java

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


Compare: https://github.com/Evolveum/midpoint/compare/31f63e52d2df...459d1bbe05a2