Skip to content
Snippets Groups Projects
Commit 34709783 authored by Patrick Barroca's avatar Patrick Barroca
Browse files

version 7.5.20 

Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/ZendAfi/View/Helper/Accueil/Library.php
	library/startup.php
	tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php
parents 61314823 4c009339
Branches
Tags
Hide whitespace changes
Inline Side-by-side
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