[zanata/zanata-platform] 70f65f: 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: 70f65f37a5bfadeb728aef4aca4b2068dcd37c54
      https://github.com/zanata/zanata-platform/commit/70f65f37a5bfadeb728aef4aca4b2068dcd37c54
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-09-14 (Thu, 14 Sep 2017)

  Changed paths:
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/resources/messages.properties
    A server/zanata-frontend/src/frontend/.nvmrc
    A server/zanata-frontend/src/frontend/.yarn-version
    M server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/frontend/makefile
    M server/zanata-frontend/src/frontend/package.json
    M server/zanata-frontend/src/frontend/yarn.lock
    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