# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.

Merge branch 'display_day_of_week_in_events' of http://git.afi-sa.fr/llaffont/opacce into llaffont/opacce-display_day_of_week_in_events

Conflicts:
	application/modules/opac/controllers/CmsController.php
	tests/application/modules/opac/controllers/CmsControllerTest.php

Conflicts:
	library/Class/Article.php
	library/Class/ArticleCategorie.php
	library/Class/Catalogue.php
	library/Class/Sitotheque.php

Conflicts:
	application/modules/admin/controllers/CmsController.php
	cosmogramme/php/_init.php
	library/Class/AdminVar.php
	library/Class/ArticleCategorie.php
	library/Class/Catalogue.php
	library/Class/TypeDoc.php
	library/Class/Users.php
	tests/application/modules/admin/controllers/CmsControllerTest.php

Conflicts:
	library/Class/Article.php
	library/Class/Catalogue.php
	library/Class/Sitotheque.php

Hotline master

See merge request !691

Conflicts:
	VERSIONS
	library/startup.php

Hotline #21243 fix default properties overwrite in widget

See merge request !689

Conflicts solved:
	cosmogramme/php/_init.php
	library/Class/Codification.php
	library/ZendAfi/View/Helper/Frbr.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php

Conflictsi solved:
	application/modules/opac/controllers/RechercheController.php
	cosmogramme/php/_init.php
	library/Class/Notice.php
	library/Class/PanierNotice.php
	library/ZendAfi/Form/Album.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php

Hotline master

See merge request !687

Conflicts:
	VERSIONS
	library/startup.php

Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_230.php
	library/startup.php

Hotline #20093 save 2 cols widget delete insite widget settings

See merge request !679

Hotline #18075 fix  private profil and rewrite url

See merge request !671

Hotline #20607 orphee integration issues

See merge request !673

Hotline #16604 fix default value in stats notices table

See merge request !674

Hotline#20588 suggestions

See merge request !682

Hotline#20851 facebook article

See merge request !677