Laurent Destailleur 4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/product/class/product.class.php

2015-12-13 15:53:57 +01:00

..

devices

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

emotes

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

flags

Optimized theme images

2014-08-19 12:39:25 +02:00

mime

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-12-13 15:53:57 +01:00

treemenu

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

weather

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

colorpicker.png

Optimized theme images

2014-08-19 12:39:25 +02:00

dolibarr_box.png

Optimized theme images

2014-08-19 12:39:25 +02:00

dolistore.jpg

Optimized theme images

2014-08-19 12:39:25 +02:00

folder-new.png

Optimized theme images

2014-08-19 12:39:25 +02:00

gmap.png

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

help.png

Optimized theme images

2014-08-19 12:39:25 +02:00

ical.gif

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

index.html

…

information.png

…

nophoto.jpg

Optimized theme images

2014-08-19 12:39:25 +02:00

paypal.png

Optimized theme images

2014-08-19 12:39:25 +02:00

redstar.png

Optimized theme images

2014-08-19 12:39:25 +02:00

rss.gif

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

skype_callbutton.png

Optimized theme images

2014-08-19 12:39:25 +02:00

skype_chatbutton.png

Optimized theme images

2014-08-19 12:39:25 +02:00

star.png

…

transform-crop-and-resize.png

Optimized theme images

2014-08-19 12:39:25 +02:00

transparent.png

…

vcal.gif

Fix #3930 Removed executable bit

2015-12-09 13:28:36 +01:00

view-refresh.png

Optimized theme images

2014-08-19 12:39:25 +02:00