[zanata/zanata-platform] 659bcf: feat(ZNTA-2300): editor concurrent save resolution

[GitHub]

  Branch: refs/heads/editor-concurrent-save/ZNTA-2300
  Home:   https://github.com/zanata/zanata-platform
  Commit: 659bcfd58a11a7dc1fae3f0d5fd63136fc8c950c
      https://github.com/zanata/zanata-platform/commit/659bcfd58a11a7dc1fae3f0d5fd63136fc8c950c
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat(ZNTA-2300): editor concurrent save resolution



      **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.