Merge branch '2.0-dataset-sources' of github.com:okfn/ckanext-harvest into 2.0-dataset-sources

Browse Source

Conflicts:
	ckanext/harvest/logic/action/update.py

...

This commit is contained in:

amercader 2012-12-14 14:58:09 +00:00

parent 478326922b 96a91dee86

commit eb50b440bf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available