Laurent Destailleur 04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php

2018-02-27 19:18:43 +01:00

..

admin

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

class

NEW Can get template of email from its label

2018-02-23 11:23:36 +01:00

card.php

Look and feel v6

2017-06-21 11:37:34 +02:00

edit.php

USe second parameter in GETPOST

2017-09-15 10:50:50 +02:00

index.php

Fix regression on categories

2017-08-27 12:28:59 +02:00

photos.php

FIX #7072

2017-07-25 19:57:51 +02:00

traduction.php

FIX #7072

2017-07-25 19:57:51 +02:00

viewcat.php

Clean code of deprecated usage

2018-02-21 14:48:25 +01:00