Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php

2013-10-14 12:21:29 +02:00

..

img

// Welcome 2013

2013-01-04 11:19:03 +01:00

blocklayered-15.css

[-] BO : #PSCFI-4696 - Blocklayered : option "Hide filter values with no product is matching" does'nt work

2012-02-09 15:15:18 +00:00

blocklayered-ajax-back.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

blocklayered-ajax.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

blocklayered-attribute-indexer.php

// Blocklayered Fix bug with SSL

2012-02-02 10:48:48 +00:00

blocklayered-no-products.tpl

// Welcome 2013

2013-01-04 11:19:03 +01:00

blocklayered-price-indexer.php

// Blocklayered Fix bug with SSL

2012-02-02 10:48:48 +00:00

blocklayered-url-indexer.php

// Blocklayered Fix bug with SSL

2012-02-02 10:48:48 +00:00

blocklayered.css

[-] BO : #PSCFI-4696 - Blocklayered : option "Hide filter values with no product is matching" does'nt work

2012-02-09 15:15:18 +00:00

blocklayered.js

Merge pull request #746 from Mainmich/patch-1

2013-09-26 14:16:51 +02:00

blocklayered.php

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-10-14 12:21:29 +02:00

blocklayered.tpl

[-] MO : Fixed a bug when displaying textures

2013-09-12 07:01:55 +02:00

config.xml

[-] MO : fixed module upgrade with common version number

2013-08-08 11:03:22 +02:00

delete.gif

// New template for the blocklayered

2011-12-05 14:08:13 +00:00

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

logo.gif

2011-07-06 10:54:11 +00:00

logo.png

// new icon for adminhome, adminmodules and header

2011-11-21 09:21:26 +00:00