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
..
ckeditor	Fix regression	2017-12-12 10:13:48 +01:00
img	Fix menu with smartphone	2017-12-08 19:23:13 +01:00
tpl	Work on default theme	2015-10-01 23:19:50 +02:00
.gitignore	Work on default theme	2015-10-01 23:19:50 +02:00
AUTHOR	Work on default theme	2015-10-01 23:19:50 +02:00
graph-color.php	Fix menu with smartphone	2017-12-08 19:23:13 +01:00
index.html	Work on default theme	2015-10-01 23:19:50 +02:00
style.css.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-21 14:35:33 +01:00
thumb.png	Removed old theme with no maintener.	2015-10-01 23:27:41 +02:00