Laurent Destailleur fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 ...

Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php

2015-07-19 11:38:44 +02:00

..

index.php

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

2015-07-19 11:38:44 +02:00