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

Merge branch 'dev#19542-miop-fix-user-passwords' 

Conflicts:
	library/Class/Article.php
	library/Class/ArticleCategorie.php
	library/Class/Catalogue.php
	library/Class/Sitotheque.php
parents bde3e157 ed1bd904
Branches
Tags
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1000 additions and 460 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