Hotline master

See merge request !1298

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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/integration/pseudo_notices.php
#	cosmogramme/php/integre_traite_main.php
#	library/startup.php

Merge branch 'hotline#33501_cosmogramme_modification_des_strategies_par_type_d_operation_inctot' into 'stable'

Hotline#33501 cosmogramme modification des strategies par type d operation inctot

See merge request !1297

Hotline#33472 gros problemes d url suite url rewriting sur prod

See merge request !1296

Master

See merge request !1291

Merge branch 'stable'

Conflicts:
	VERSIONS
	library/startup.php

Dev#23223 sito widget pagination

See merge request !1288

fix number of sites taken in account in grouped display

Dev#5524 add refound block to viewnotice

See merge request !1287

test fix

add rebound link

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#23223_sito_widget_pagination

Conflicts:
	cosmogramme/sql/patch/patch_279.php
	tests/db/UpgradeDBTest.php

Merge branch 'dev#32494_sitotheque_utiliser_l_interface_album_pour_creer_une_sitotheque' into 'master'

Dev#32494 sitotheque utiliser l interface album pour creer une sitotheque

See merge request !1286

Add /skins in .gitignore

See merge request !1274

Hotline#32189 fix reviews moderation pagination

See merge request !1280

Merge branch 'dev#29947_miop_migration_typo3_iteration_finale_import_a_partir_de_mardi_17' into 'master'

Dev#29947 miop migration typo3 iteration finale import a partir de mardi 17

See merge request !1284

Hotline master

See merge request !1282

Merge branch 'dev#32614_une_newsletter_dupliquee_doit_etre_automatiquement_mise_en_brouillon_hackest' into 'master'

Dev#32614 une newsletter dupliquee doit etre automatiquement mise en brouillon hackest

See merge request !1281