Conflicts:
	library/Class/AdminVar.php
	tests/library/Class/AlbumTest.php

Rd #14085 pnb

See merge request !714

fix failing test on CI

add debug infos for failing test on CI

Display book player when available

Import Dilicom book thumbnails

Import Dilicom PNB offers file

add ONIX collection

ONIX import: add category name, editors

add screen to import an ONIX file

more album MARC refactoring

album MARC refactoring

Hotline master

See merge request !710

album MARC refactoring: fix regressions

album MARC refactoring

Merge branch 'hotline#21501-permissions-definition-deleted-when-linked-group-deleted' into 'hotline-master'

Hotline#21501 permissions definition deleted when linked group deleted

See merge request !709

album MARC storage refactoring

fix regression in album::getEditors()

import ONIX book to album

More ONIX parsing

Hotline master

See merge request !705

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_231.php
	library/startup.php

Hotline#21388 sql patch checksums

See merge request !704

# 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.