[ckan-changes] [ckan/ckan] 955462: [#3816] fix merge

[GitHub]

  Branch: refs/heads/3816-query-based-views
  Home:   https://github.com/ckan/ckan
  Commit: 9554620da5cd38c51b32e00fbe6ed0b772f471f6
      https://github.com/ckan/ckan/commit/9554620da5cd38c51b32e00fbe6ed0b772f471f6
  Author: Ian Ward <ian at excess.org>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3816] fix merge