Laurent Destailleur 574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/accountancy/bookkeeping/balance.php htdocs/adherents/class/subscription.class.php htdocs/compta/bank/categ.php htdocs/compta/facture/class/facture.class.php htdocs/core/boxes/box_task.php htdocs/core/class/commondocgenerator.class.php htdocs/core/class/interfaces.class.php htdocs/core/lib/project.lib.php htdocs/core/modules/modCategorie.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/install/repair.php htdocs/main.inc.php htdocs/product/price.php htdocs/projet/tasks/time.php htdocs/reception/card.php		2020-11-27 15:45:12 +01:00
..
admin	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
class	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
card.php	Feature : ajout de la class "button-cancel"	2020-11-23 15:12:52 +01:00
edit.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-27 15:45:12 +01:00
index.php	Fix css	2020-11-23 19:53:58 +01:00
info.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
photos.php	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
traduction.php	Feature : ajout de la class "button-cancel"	2020-11-23 15:12:52 +01:00
viewcat.php	Fix css	2020-11-23 19:53:58 +01:00