Skip to content
Snippets Groups Projects
Commit 54a0dc5f authored by André Lahmann's avatar André Lahmann
Browse files

Merge remote-tracking branch 'finc/master' into issue/7163

Conflicts:
	.gitignore
	README.md
	import/marc_local.properties
	solr/biblio/conf/schema.xml
parents f2dca557 17afe34c
Showing
with 321 additions and 1627 deletions
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