Skip to content
Snippets Groups Projects
Commit eaf151d7 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.5' into develop

Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
parents 7af5cc18 684be448
No related branches found
No related tags found
No related merge requests found
Showing
with 97 additions and 48 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment