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

[GitHub]

  Branch: refs/heads/rel2master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 6c9a5b33c3c19743d5f47a618ac5f9f3725beb68
      https://github.com/zanata/zanata-platform/commit/6c9a5b33c3c19743d5f47a618ac5f9f3725beb68
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.css
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into rel2master


  Commit: 427379e448db11952da4bf97b309deea52e20daf
      https://github.com/zanata/zanata-platform/commit/427379e448db11952da4bf97b309deea52e20daf
  Author: kgough <kgough at redhat.com>
  Date:   2018-01-18 (Thu, 18 Jan 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.css

  Log Message:
  -----------
  fix(rel2master) fix merge conflicts in css


Compare: https://github.com/zanata/zanata-platform/compare/6c9a5b33c3c1^...427379e448db