Conflicts:
	VERSIONS
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php

This reverts commit b42b7213.

Do not stop genre search at first match, but continue until we have no
rules left.
Applies to section and emplacement too.

This patch also fixes the regular expression for extracting subfield
values from iso2709 data by using "positive lookahead" feature.
(see http://www.regular-expressions.info/lookaround.html)
The regexp used to fail when a field contains two consecutive subfields
with the same code. Example: 902 $a value $a another value

Hotline 6.49

See merge request !334

Hotline 6.49

See merge request !333

Conflicts:
	VERSIONS

use anx_nxt instead of anx_ori

Conflicts:
	VERSIONS

Conflicts:
	VERSIONS

Add height parameter to album in diaporama mode to specify default
heights for public rendering

Update VERSIONS

Orphee: For holds, if tag anx_ori is provided, associate the item to the
right library

Dev improve php mode indentation

See merge request !326

This reverts commit b42b7213.

Add tests to check facets are generated

define bokeh coding style

Do not stop genre search at first match, but continue until we have no
rules left.
Applies to section and emplacement too.

This patch also fixes the regular expression for extracting subfield
values from iso2709 data by using "positive lookahead" feature.
(see http://www.regular-expressions.info/lookaround.html)
The regexp used to fail when a field contains two consecutive subfields
with the same code. Example: 902 $a value $a another value

Hotline #13648 Fix "ISO5426 to UTF8" conversion of '«' and '»'

This patch also replaces unimarc_archeo_animaux.txt by a valid ISO2709 file (yaz-marcdump was printing several errors about this file) and fix the corresponding unit tests

See merge request !322

This patch also replaces unimarc_archeo_animaux.txt by a valid ISO2709
file (yaz-marcdump was printing several errors about this file) and fix
the corresponding unit tests