Alexandre SPANGARO 3827903afb Merge remote-tracking branch 'uptream/develop' into 6.0-vat2 ... # Conflicts: # htdocs/compta/salaries/card.php		2017-06-08 06:44:48 +02:00
..
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-12 15:45:30 +02:00
card.php	Merge remote-tracking branch 'uptream/develop' into 6.0-vat2	2017-06-08 06:44:48 +02:00
document.php	FIX #6945	2017-06-06 10:53:53 +02:00
index.php	FIX #6945	2017-06-06 10:53:53 +02:00
info.php	Update documents & info page - better look & feel v6	2017-05-29 06:35:53 +02:00