Skip to content
Snippets Groups Projects
Commit d94472ea authored by efalcy's avatar efalcy
Browse files

Merge branch 'hotline_#26977_url_blog_critiques' into stable 

Conflicts:
	library/Class/Newsletter.php
	library/ZendAfi/View/Helper/Accueil/Critiques.php
	library/ZendAfi/View/Helper/TagAnchor.php
	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
	tests/library/Class/NewsletterMailingTest.php
parents 8b189781 4be45352
Branches
Tags
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 38 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