Laurent Destailleur 11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php		2017-05-05 14:49:25 +02:00
..
ckeditor	Work on look and feel v6	2017-04-07 16:16:44 +02:00
img	Work on module website	2017-04-28 13:10:08 +02:00
tpl	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
.gitignore	Prepare freeze	2014-11-07 21:52:50 +01:00
AUTHOR	Ajout du theme "eldy".	2004-02-21 17:04:52 +00:00
graph-color.php	Css	2017-04-01 00:59:21 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
style.css.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 14:49:25 +02:00
thumb.png	Optimized theme images	2014-08-19 12:39:25 +02:00