[zanata/zanata-server] 122b16: fix(merge trans dialog):update broken dialog for m...

[GitHub]

  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-server
  Commit: 122b164622f5c9f006af88a349f58d93937d4fbb
      https://github.com/zanata/zanata-server/commit/122b164622f5c9f006af88a349f58d93937d4fbb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml

  Log Message:
  -----------
  fix(merge trans dialog):update broken dialog for merge trans

https://zanata.atlassian.net/browse/ZNTA-844


  Commit: 53265952868a9aab05b3802d569573c72437be7c
      https://github.com/zanata/zanata-server/commit/53265952868a9aab05b3802d569573c72437be7c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml

  Log Message:
  -----------
  Merge pull request #1069 from zanata/ZNTA-844

fix(merge trans dialog):update broken dialog for merge trans


Compare: https://github.com/zanata/zanata-server/compare/464a67a60228...53265952868a