Laurent Destailleur c06abac49e Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/compta/salaries/index.php
	htdocs/contact/class/contact.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/geturl.lib.php
	htdocs/core/lib/pdf.lib.php

2015-08-30 21:20:50 +02:00

..

class

Move my address email to new one

2015-07-15 20:30:33 +02:00

card.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

document.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

index.php

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

2015-08-30 21:20:50 +02:00

info.php

NEW Clean code into salary module, debug and add indexes

2015-05-13 08:57:39 +02:00