Skip to content
Snippets Groups Projects
pbarroca's avatar
Patrick Barroca authored
Merge remote-tracking branch afi/master into dev#21441_creer_des_facettes_a_partir_des_custom_fields

# Conflicts:
#	cosmogramme/sql/patch/patch_265.php
5acaf60e