7.11.15

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

Hotline#64820 connecteur cite de la musique

See merge request !2450

Merge branch 'hotline#65920_boites_kiosque_fonction_de_tirage_aleatoire_ne_fonctionne_pas' into 'stable'

hotline #65920 kiosk widget: random option fix

See merge request !2452

hotline #66892 mobile: fix "next page"  on search result

See merge request !2451

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
#	public/opac/java/mycarousel_horizontal/jMyCarousel.pack.js
#	public/opac/java/mycarousel_vertical/jMyCarousel.pack.js

Hotline#66771 date de validite de la carte lecteur

See merge request !2447

Hotline#62058 kiosque en mode responsive ko vsr cavy

See merge request !2446

hotline #67053 : change admin menu order

See merge request !2448

hotline #66771 : do not erase user information from file import when webservice does not provide them

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php

Merge branch 'hotline#67869_probleme_dans_l_interrogation_de_champs_461_titres_de_series' into 'stable'

Hotline#67869 probleme dans l interrogation de champs 461 titres de series

See merge request !2442

hotline #68652 : fix filters / osm interaction in jquery 3

See merge request !2441

Hotline#66282 probleme activation de compte sur un site en https

See merge request !2440

Hotline#64183 bug lien parametrage de boite login

See merge request !2438

Merge branch 'hotline#67202_titres_remplaces_par_d_autres_titres_dans_bokeh_urgent_svp' into 'hotline-master'

Hotline#67202 titres remplaces par d autres titres dans bokeh urgent svp

See merge request !2432