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

Hotline#17208 memory leak

See merge request !492

Hotline #17196 partition type doc as periodic

See merge request !491

Hotline/17262 same label for facette

See merge request !488

Merge branch 'hotline_#17242_cms_workflow_send_mail_to_author_when_article_is_accepted' into 'hotline_6.54'

Hotline #17242 cms workflow send mail to author when article is accepted

See merge request !481

Hotline#17308 view not set on webthumbnail viewhelper

See merge request !487

Hotline/17157 marc conf is not shown

See merge request !485

selecting unimarc or marc21 in profil creation.

Hotline/17236 fix double encoding on update

See merge request !480

Julian Maurice authored 10 years ago and efalcy committed 10 years ago

because they break some skins

Alex Arnaud authored 10 years ago and efalcy committed 10 years ago

tests.

Patrick Barroca authored 10 years ago and efalcy committed 10 years ago

fix #16765 : remove method containing subselect on records to extract id_notice, give responsibility to user code to give a tuned query to retreive ids only