Laurent Destailleur 7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/public/paybox/newpayment.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php htdocs/public/stripe/newpayment.php		2018-01-31 20:25:24 +01:00
..
canvas	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-21 14:35:33 +01:00
class	Fix extrafields	2018-01-31 14:01:58 +01:00
agenda.php	Standardize code for events	2017-10-04 12:58:13 +02:00
card.php	Changed MAIN_SHOW_REGION_IN_STATE to MAIN_SHOW_REGION_IN_STATE_SELECT for clarity	2018-01-25 16:14:39 +00:00
document.php	Merge pull request #8047 from hregis/develop_multicompany	2018-01-11 01:07:17 +01: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
info.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
ldap.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
list.php	correct merge	2017-12-29 20:41:39 +01:00
note.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
perso.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
vcard.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-13 04:03:23 +02:00