[zanata/zanata-server] b03d30: Use version label template on version merge dialog...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: b03d30d86e36a16462c2bcf8820d431a8ab9fd94
      https://github.com/zanata/zanata-server/commit/b03d30d86e36a16462c2bcf8820d431a8ab9fd94
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

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

  Log Message:
  -----------
  Use version label template on version merge dialog.

This can be seen by navigating to:

 - version -> merge translations dialog


  Commit: 487cde4243a32df4553fca3b420ee04fd5939b02
      https://github.com/zanata/zanata-server/commit/487cde4243a32df4553fca3b420ee04fd5939b02
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add bugfix rhbz1202670 to release notes


  Commit: 333016f8380d66b4ece6f0d8dbd97e5cb3f5c8d4
      https://github.com/zanata/zanata-server/commit/333016f8380d66b4ece6f0d8dbd97e5cb3f5c8d4
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #741 from zanata/display-version-state

Update version display for version merge, add release notes entry.


Compare: https://github.com/zanata/zanata-server/compare/3e944285f6b9...333016f8380d