[ckan-changes] [okfn/ckan] 017024: Fixing bad merge

• Previous message: [ckan-changes] [okfn/ckan] b50758: [2467] Add excanvas to flot vendor directory
• Next message: [ckan-changes] [okfn/ckan] bd65de: [2518] Allow custom i18n directory.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-2347-related-dashboard
  Home:   https://github.com/okfn/ckan
  Commit: 0170240e93b8725fefd9c71cc21cb794648f2cf0
      https://github.com/okfn/ckan/commit/0170240e93b8725fefd9c71cc21cb794648f2cf0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Fixing bad merge

• Previous message: [ckan-changes] [okfn/ckan] b50758: [2467] Add excanvas to flot vendor directory
• Next message: [ckan-changes] [okfn/ckan] bd65de: [2518] Allow custom i18n directory.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]