Conflicts:
	library/Class/CommSigb.php

Hotline#27962 sito viewcat keep id cat in search form

See merge request !1385

Hotline#35855 canconsult error 500

See merge request !1384

Hotline#35865 add portal to selectable list in admin user form

See merge request !1379

Hotline#35175 erreur reservation

See merge request !1376

Hotline#33956 1dtouch fix import

See merge request !1378

Hotline#35614 bookmarks doesnt work with sigb account level

See merge request !1374

hotline #35164 fix position of viewableDomainsJsonAction to allow user with role level < 3 to access action

Merge branch 'hotline#34250_suite_problemes_infra_ftp_les_imports_totaux_abonnes_ne_doivent_plus_supprimer_d_abonnes' into 'hotline-master'

Hotline#34250 suite problemes infra ftp les imports totaux abonnes ne doivent plus supprimer d abonnes

ATTENTION: merge request dans negative: http://git.afi-sa.fr/afi/negative/merge_requests/9

See merge request !1369

Merge branch 'hotline#31657_pb_authentification_sur_le_site_wwwmamediathequenet' into 'hotline-master'

Hotline#31657 pb authentification sur le site wwwmamediathequenet

See merge request !1368

hotline #31657  BASE_URL also used as cache seed in order to avoid cache conflicts when a Bokeh instance is accessible via several directories

Hotline#33637 probleme sur portail mediatheque de houilles

See merge request !1366