Jerome Nadaud 8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	controllers/admin/AdminCategoriesController.php

2013-10-25 14:29:02 +02:00

..

css

// toolbar nav fixs

2013-10-25 10:33:45 +02:00

font

// Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch

2013-06-28 19:35:32 +02:00

img

//dashboard data binding first part

2013-09-02 11:43:50 +02:00

js

//Starting Uploader helper

2013-10-25 14:19:51 +02:00

template

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

2013-10-25 14:29:02 +02:00

bower.json

// update bower with latest bootstrap 3.0.0 + fix layout

2013-08-21 17:17:24 +02:00

config.rb

// Fixed boulette

2013-10-24 19:29:22 +02:00

index.php

// Welcome 2013

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