Skip to content
Snippets Groups Projects
Commit 5d9474f6 authored by Alex Arnaud's avatar Alex Arnaud
Browse files

Merge remote-tracking branch 'origin/dev#21441_creer_des_facettes_a_partir_des_custom_fields'

Conflicts solved:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_266.php
parents b236226a ad0032d0
3 merge requests!1132Hotline#29412 images des articles dans le resultat de recherche,!1120Master,!1092Sandbox gladys suggests
Showing
with 580 additions and 324 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment