Laurent Destailleur fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php		2016-08-28 02:40:20 +02:00
..
admin	Revert commit that break compatibility of 100% of modules	2016-03-25 15:24:57 +01:00
class	Merge branch 'refactor-rest-api' of	2016-07-27 14:06:14 +02:00
card.php	Uniformize presentation on categories	2016-08-10 15:16:30 +02:00
categorie.php	Fix of bugs reported by scrutinizer	2016-06-29 11:20:48 +02:00
edit.php	Fix bad link on category	2015-12-19 13:55:27 +01:00
index.php	Fix tag was not visible	2016-07-30 14:05:39 +02:00
photos.php	Fix css	2016-05-21 15:03:02 +02:00
traduction.php	Fix css	2016-05-21 15:03:02 +02:00
viewcat.php	Uniformize presentation on categories	2016-08-10 15:16:30 +02:00