[ckan-changes] [okfn/ckan] 075fde: fix merge

• Previous message: [ckan-changes] [okfn/ckan] 6cafd9: [#985] Remove files that are not needed any more f...
• Next message: [ckan-changes] [okfn/ckan] be7e4f: [#1121] Use get_action() in term_translation_updat...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/547-plugins-love
  Home:   https://github.com/okfn/ckan
  Commit: 075fde3c818f8a0e7b33b970d07675598196f986
      https://github.com/okfn/ckan/commit/075fde3c818f8a0e7b33b970d07675598196f986
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckanext/datastore/tests/test_dump.py

  Log Message:
  -----------
  fix merge

• Previous message: [ckan-changes] [okfn/ckan] 6cafd9: [#985] Remove files that are not needed any more f...
• Next message: [ckan-changes] [okfn/ckan] be7e4f: [#1121] Use get_action() in term_translation_updat...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]