# Conflicts:
#	library/ZendAfi/Form/Decorator/AuthorityPicker.php
#	public/opac/js/authority_picker/tests.js

Hotline#100972 minsoc tess

See merge request !3535

Minsoc hotline 109030 delete not selected keywords search

See merge request !3534

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

Merge branch 'hotline#100972_minsoc_portail_internet_incoherence_facette_motcle_tess_avec_le_terme_tess_recherche' into 'minsoc_prod'

hotline#100972 : minsoc fix codif_thesaurus error

See merge request !3533

hotline #109030 : minsoc : delete 'not selected' display

See merge request !3511

hotline#100972 fix update thesaurus facets

See merge request !3508

hotline #103670 : kiosk : fix preferences sort display

See merge request !3510

Currently translated at 100.0% (5040 of 5040 strings)

Hotline

See merge request !3456

hotline #102336 : fix bug on training hour

See merge request !3434

hotline #101969 fix <br /> in holds popups

See merge request !3451

hotline #99121 fix "lost password" workflow when a user has registered and…

See merge request !3453

hotline #108377 : fix Dilicom hold quota of guest users

See merge request !3452

Merge branch 'dev#102397_minsoc_les_facettes_dynamiques_ne_prennent_en_compte_que_9999_valeurs' into 'master'

dev#102397 : Facets : The thesaurii Id cannot take more than 10000 values

See merge request !3454

hotline #99121 fix "lost password" workflow when a user has registered and activated her account, but no admin has validated this account yet

hotline#104010 : OPAC Article : Dates were defaulted to erroneous values in Articles Display.

See merge request !3446

Hotline

See merge request !3449

hotline #108377 : fix Dilicom quota of guest users

See merge request !3448