[zanata/zanata-platform] 9ca651: Merge branch 'master' into ZNTA-2176-change-name-i...

[GitHub]

  Branch: refs/heads/ZNTA-2176-change-name-invite-only
  Home:   https://github.com/zanata/zanata-platform
  Commit: 9ca65117cda3070485713b80e333ae64305da136
      https://github.com/zanata/zanata-platform/commit/9ca65117cda3070485713b80e333ae64305da136
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M build-tools/src/test/java/TestJenkinsfile.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2176-change-name-invite-only