[ckan-changes] [ckan/ckan] 1176e0: [#2006] apply package_saver.py change to plugins.p...

[GitHub]

  Branch: refs/heads/1414-remove-moderated-edits
  Home:   https://github.com/ckan/ckan
  Commit: 1176e0332efce02943c1139319f6ce64bfaad1bb
      https://github.com/ckan/ckan/commit/1176e0332efce02943c1139319f6ce64bfaad1bb
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#2006] apply package_saver.py change to plugins.py (fix merge conflict)


  Commit: abd41729cb11c4692fe2cf8f1cd5243f72fbb3fc
      https://github.com/ckan/ckan/commit/abd41729cb11c4692fe2cf8f1cd5243f72fbb3fc
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#2006] adjust for different model import


Compare: https://github.com/ckan/ckan/compare/525fd7d4c6d9...abd41729cb11