[zanata/zanata-platform] 014eac: Merge branch 'master' into znta-2669-gwt-mt-attrib...

[GitHub]

  Branch: refs/heads/znta-2669-gwt-mt-attribute
  Home:   https://github.com/zanata/zanata-platform
  Commit: 014eace118070d944488171eddccb60a8537dc36
      https://github.com/zanata/zanata-platform/commit/014eace118070d944488171eddccb60a8537dc36
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge branch 'master' into znta-2669-gwt-mt-attribute



      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.