[zanata/zanata-platform] a0c377: Merge remote-tracking branch 'origin/release' into...

[GitHub]

  Branch: refs/heads/fix-merge-conflicts
  Home:   https://github.com/zanata/zanata-platform
  Commit: a0c3773476a8b24bf4f6b656b6782797ed9caa7e
      https://github.com/zanata/zanata-platform/commit/a0c3773476a8b24bf4f6b656b6782797ed9caa7e
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/ReviewCriteria.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into fix-merge-conflicts