[midPoint-git] [Evolveum/midpoint] 27294f: small fix for shopping cart

[kate]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 27294faf42494ba9ef9520aa3b4087837a12e627
      https://github.com/Evolveum/midpoint/commit/27294faf42494ba9ef9520aa3b4087837a12e627
  Author: kate <honchar at evolveum.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  small fix for shopping cart


  Commit: 0a017c28b976462335f33e2994639bae5c275ff3
      https://github.com/Evolveum/midpoint/commit/0a017c28b976462335f33e2994639bae5c275ff3
  Author: kate <honchar at evolveum.com>
  Date:   2017-11-30 (Thu, 30 Nov 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java

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


Compare: https://github.com/Evolveum/midpoint/compare/f3c7f9a1ebc0...0a017c28b976