[zanata/zanata-platform] a24c3f: Merge remote-tracking branch 'origin/master' into ...

[GitHub]

  Branch: refs/heads/ZNTA-1694
  Home:   https://github.com/zanata/zanata-platform
  Commit: a24c3f8a45ccf7f03c8fedea8d52a79e82cdc0fe
      https://github.com/zanata/zanata-platform/commit/a24c3f8a45ccf7f03c8fedea8d52a79e82cdc0fe
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2017-12-08 (Fri, 08 Dec 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/frontend/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/frontend/app/components/Sidebar/index.jsx
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/AboutPage.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.less

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-1694


  Commit: 422950488579c56d9cd14545736d273b424859ad
      https://github.com/zanata/zanata-platform/commit/422950488579c56d9cd14545736d273b424859ad
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2017-12-08 (Fri, 08 Dec 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/components/Sidebar/Sidebar.story.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.less

  Log Message:
  -----------
  feat(ZNTA-1694) add toolbar for Project Version People page


Compare: https://github.com/zanata/zanata-platform/compare/a24c3f8a45cc^...422950488579