[midPoint-git] [Evolveum/midpoint] 7e409f: fix

[Petr Gašparík]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7e409fad268c13f6943e3cff8a51cec2a460690a
      https://github.com/Evolveum/midpoint/commit/7e409fad268c13f6943e3cff8a51cec2a460690a
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  fix


  Commit: 17d766e9d7cb21d612c9bbf4bc9b44046478b66e
      https://github.com/Evolveum/midpoint/commit/17d766e9d7cb21d612c9bbf4bc9b44046478b66e
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

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

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint.properties


Compare: https://github.com/Evolveum/midpoint/compare/970cfba860ad...17d766e9d7cb