[ckan-changes] [ckan/ckan] 05e357: Fix conflict merge

[GitHub]

  Branch: refs/heads/poc-flask-views
  Home:   https://github.com/ckan/ckan
  Commit: 05e35733d78b81be524f8f98111d852f596e8a2a
      https://github.com/ckan/ckan/commit/05e35733d78b81be524f8f98111d852f596e8a2a
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-04 (Thu, 04 Aug 2016)

  Changed paths:
    M ckan/config/middleware/common_middleware.py

  Log Message:
  -----------
  Fix conflict merge