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

version 7.3.11 

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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/classes/classe_notice_integration.php
#	library/startup.php
parents 3a50b9d0 4ff008b5
4 merge requests!1132Hotline#29412 images des articles dans le resultat de recherche,!1120Master,!1088Master,!1087Hotline master
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 437 additions and 310 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