Kevin Granger 69b38f4d6f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl
	admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl

2013-09-09 18:13:49 +02:00

..

css

// tree view product

2013-09-09 18:12:31 +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

// tree view product

2013-09-09 18:12:31 +02:00

template

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

2013-09-09 18:13:49 +02:00

bower.json

// update bower with latest bootstrap 3.0.0 + fix layout

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

config.rb

// config Compass + Bower Update

2013-08-30 15:18:20 +02:00

index.php

// Welcome 2013

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