Hotline 6.55 (!500) · Merge requests · afi / opacce

Merged Hotline 6.55

hotline_6.55 into hotline_#17249_auto_open_vertical_menu

Merged Ghislain Loas requested to merge hotline_6.55 into hotline_#17249_auto_open_vertical_menu 10 years ago

Viewing commit af84c57f

Prev Next

Show latest version

Files

af84c57f

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

Patrick Barroca authored 10 years ago

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

Admin message

Hotline 6.55

Merge request reports

Files