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

Merge branch 'stable' 

Conflicts:
	library/Class/CVSLink.php
	tests/application/modules/opac/controllers/AbonneControllerPretsTest.php
	tests/library/Class/CVSLinkTest.php
	tests/library/Class/UsersTest.php
parents b0bb7cc6 dbd33462
Branches
Tags
1 merge request!1267Master
Hide whitespace changes
Inline Side-by-side
Showing
with 306 additions and 164 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