Laurent Destailleur fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss htdocs/expedition/list.php htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/user/class/user.class.php		2015-05-16 17:09:42 +02:00
..
ckeditor	Fix: tags h correctly supported	2015-02-20 15:55:55 +01:00
img	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-16 17:09:42 +02:00
tpl	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
AUTHOR
graph-color.php	Removed closing php tag	2014-05-03 18:18:44 +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
style.css.php	Missing style buttonRefused	2015-03-08 02:26:41 +01:00
thumb.png	Optimized theme images	2014-08-19 12:39:25 +02:00