[midPoint-git] [Evolveum/midpoint] 9276e5: reverting ace.js to its previous state

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 9276e5276f14c701cd65765b495ef312887527e0
      https://github.com/Evolveum/midpoint/commit/9276e5276f14c701cd65765b495ef312887527e0
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/webapp/js/ace/ace.js
    M gui/admin-gui/src/main/webapp/less/midpoint/operation-result.less

  Log Message:
  -----------
  reverting ace.js  to its previous state


  Commit: 803287b74a1771488ca260e41478e2994a321b26
      https://github.com/Evolveum/midpoint/commit/803287b74a1771488ca260e41478e2994a321b26
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

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


Compare: https://github.com/Evolveum/midpoint/compare/a81d1c692a6f...803287b74a17