dolibarr/htdocs/theme/md
Laurent Destailleur 7ea16ac3fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/theme/md/style.css.php
2016-06-22 15:31:56 +02:00
..
ckeditor NEW: Rename path for generic medias files into '/medias' instead of 2016-05-01 16:34:50 +02:00
img Minor esthetic fixes 2016-06-07 13:15:38 +02:00
tpl
.gitignore
AUTHOR
graph-color.php Fixed md theme name 2015-12-04 18:04:41 +01:00
index.html
style.css.php Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2016-06-22 15:31:56 +02:00
thumb.png