Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:okfn/ckan into idatasetform-packa…
…ge-schemas-simplification Conflicts: ckan/controllers/package.py ckan/lib/plugins.py At this point ckanext/example_idatasetform/ is broken by the recent #649 commits, will fix it in following commits...
- Loading branch information
Showing
26 changed files
with
595 additions
and
727 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.