[zanata/zanata-server] 8e71a2: Fix wording on join group label, clear missing loc...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 8e71a2b64e303059f3b5c1c1373538842ee1bec6
      https://github.com/zanata/zanata-server/commit/8e71a2b64e303059f3b5c1c1373538842ee1bec6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Fix wording on join group label, clear missing locale list when reset statistic


  Commit: 3b814e5059e010bed5102eae1df19afdc6f6ea98
      https://github.com/zanata/zanata-server/commit/3b814e5059e010bed5102eae1df19afdc6f6ea98
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1033419

Conflicts:
	zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java


  Commit: c0fa21f7fff89e2eb391ad354ace796643736169
      https://github.com/zanata/zanata-server/commit/c0fa21f7fff89e2eb391ad354ace796643736169
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-11-24 (Sun, 24 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #291 from zanata/rhbz1033419

https://bugzilla.redhat.com/show_bug.cgi?id=1033419


Compare: https://github.com/zanata/zanata-server/compare/eac91e4ffd5d...c0fa21f7fff8