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

..

css

Put scroolbar on autocomplete ul/li and not on main windows as before

2013-10-30 09:15:36 +01:00

js

Merge remote-tracking branch 'origin/3.3' into 3.4

2013-09-11 21:54:57 +02:00

plugins

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

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