Merge remote-tracking branch afi/master into... (5acaf60e) · Commits · afi / opacce

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit 5acaf60e authored 9 years ago by

Patrick Barroca

Browse files

Merge remote-tracking branch afi/master into...

Merge remote-tracking branch afi/master into dev#21441_creer_des_facettes_a_partir_des_custom_fields

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

parents d0a559b5 11e7480b

3 merge requests!1132Hotline#29412 images des articles dans le resultat de recherche,!1120Master,!1075Dev#21441 creer des facettes a partir des custom fields

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 1618 additions and 1777 deletions

Please register or to comment

Admin message

Merge remote-tracking branch afi/master into...