Skip to content
Commit c4a566de authored by Stéphane Corlosquet's avatar Stéphane Corlosquet
Browse files

Merge branch 'master' of github.com:scor/rdf into 7.x-2.x

Cleaned up some files which should not belong to the drupal.org repository such as the ARC2 library.

Conflicts:
	README.txt
	drush/rdfx.drush.inc
	modules/evoc/evoc.info
	modules/evoc/evoc.install
	modules/evoc/evoc.module
	modules/evoc/evoc.pages.inc
	modules/evoc/evoc.test
	modules/evoc/tests/evoc_test.module
	modules/rdfui/rdfui.info
	modules/rdfui/rdfui.module
	rdfx.import.inc
	rdfx.info
	rdfx.install
	rdfx.module
	rdfx.pages.inc
	rdfx.query.inc
	rdfx.sparql.inc
	rdfx.terms.inc
	rdfx.test
parents 7f3f23e1 2e747b34
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment