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

Merge branch 'dev_#18867_typo3_dossiers_documentaires'

Conflicts:
	library/Class/Article.php
	library/Class/Catalogue.php
	library/Class/Sitotheque.php
parents dc416f6d db0f6ed4
Branches
Tags
1 merge request!715Master
Showing
with 602 additions and 103 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