[midPoint-git] [Evolveum/midpoint] 6a172f: ScriptExecutionResultType

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6a172f3a66efa0afc6d97e89550068ab902a2787
      https://github.com/Evolveum/midpoint/commit/6a172f3a66efa0afc6d97e89550068ab902a2787
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd

  Log Message:
  -----------
  ScriptExecutionResultType


  Commit: c31ebe1da6bf3efce65978ac8007055c7f035ad6
      https://github.com/Evolveum/midpoint/commit/c31ebe1da6bf3efce65978ac8007055c7f035ad6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.html

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/00d0e6aeb333...c31ebe1da6bf