[ckan-changes] [ckan/ckan] 15ed4f: Fix wrong merge

[GitHub]

  Branch: refs/heads/poc-flask-views
  Home:   https://github.com/ckan/ckan
  Commit: 15ed4fc30b597d2284c5de51df2f6e68598fdcb1
      https://github.com/ckan/ckan/commit/15ed4fc30b597d2284c5de51df2f6e68598fdcb1
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  Fix wrong merge