Master

Hotline master

See merge request !2396

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

Dev#65552 rendre les reservation afimultimedia plus visible

See merge request !2388

Merge branch 'dev#49315_ajouter_un_commentaire_sur_les_postes_etou_groupe_de_poste_visible_lors_de_la_reservation_cote_bokeh' into 'stable'

dev #49315 add note to devices

See merge request !2389

Merge branch 'dev#66943_bokeh_ne_met_pas_a_jour_la_reservation_qui_n_a_pas_ete_consommee' into 'stable'

dev #66943 update previous hold end time when overwrite

See merge request !2390