[zanata/zanata-server] a75bb3: display email only to admin in language page

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: a75bb3378e532346982deec02b3357362f76986e
      https://github.com/zanata/zanata-server/commit/a75bb3378e532346982deec02b3357362f76986e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

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

  Log Message:
  -----------
  display email only to admin in language page


  Commit: c8b35140dd43bd9aaf782f6d0e34362cb697dcbb
      https://github.com/zanata/zanata-server/commit/c8b35140dd43bd9aaf782f6d0e34362cb697dcbb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #745 from zanata/rhbz1205465

display email only to admin in language page


  Commit: 0ea0d3c3fb48eda646ce820575dfc6bf11254503
      https://github.com/zanata/zanata-server/commit/0ea0d3c3fb48eda646ce820575dfc6bf11254503
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml

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

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml


Compare: https://github.com/zanata/zanata-server/compare/a330cb1e6123...0ea0d3c3fb48