dolibarr/htdocs/theme
Laurent Destailleur 728e36f70f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/api/index.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/api_invoices.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/actions_sendmails.inc.php
2017-10-22 01:43:33 +02:00
..
common Add picto for cheque payment 2017-09-20 15:29:47 +02:00
eldy Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 01:43:33 +02:00
md Fix larger select2 combo 2017-10-21 21:05:00 +02:00
.gitignore Merge remote-tracking branch 'origin/3.7' into 3.8 2015-09-22 16:28:34 +02:00
dolibarr_logo.png NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
dolibarr_preferred_partner_int.png Fix: Typo and translation 2014-12-17 01:56:36 +01:00
dolibarr.png Fix #3930 Removed executable bit 2015-12-09 13:28:36 +01:00
dolistore_logo.png Fix #3930 Removed executable bit 2015-12-09 13:28:36 +01:00
index.html
login_logo.png