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

Merge remote-tracking branch 'refs/remotes/afi/hotline_16499_karvi' into afi-hotline_6.54

Conflicts:
	VERSIONS
	cosmogramme/php/classes/classe_notice_integration.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	library/Class/AdminVar.php
	library/Class/WebService/SIGB/AbstractService.php
	library/ZendAfi/Controller/Plugin/InspectorGadget.php
	library/ZendAfi/View/Helper/AbsoluteUrl.php
	library/startup.php
parents 95ad9eaf c793cc20
Branches
Tags
5 merge requests!529Hotline 6.56,!512Master,!500Hotline 6.55,!498Master,!496Hotline 6.54
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