Skip to content
Snippets Groups Projects
Commit bf1ef052 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'dev_#18087_orphea_harvest' 

Conflicts:
	library/Class/AdminVar.php
	library/Class/Batch.php
	library/Class/TypeDoc.php
	library/Class/WebService/BibNumerique/RessourceNumerique.php
	scripts/emacs/yasnippet/snippets/text-mode/php-mode/teardown
	tests/fixtures/RessourcesNumeriquesFixtures.php
parents a4bf0440 abb07b8a
Branches
Tags 6.20
1 merge request!780Master
Hide whitespace changes
Inline Side-by-side
Showing
with 821 additions and 143 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