Laurent Destailleur eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_builddoc.inc.php htdocs/core/class/html.form.class.php htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/core/tpl/admin_extrafields_edit.tpl.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/notes.tpl.php htdocs/main.inc.php htdocs/product/inventory/tpl/inventory.tpl.php htdocs/societe/tpl/linesalesrepresentative.tpl.php		2017-12-21 14:35:33 +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 sync contact - external user	2017-12-19 16:16:31 +01:00
agenda.php	Standardize code for events	2017-10-04 12:58:13 +02:00
card.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
document.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +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
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	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +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