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

Conflicts:
	admin-dev/themes/default/css/admin-theme.css

2013-11-05 16:42:09 +01:00

..

css

// backward CSS

2013-11-05 16:40:21 +01: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

// horizontal nav

2013-11-01 15:50:33 +01:00

scss

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

2013-11-05 16:42:09 +01:00

template

// Groups review

2013-11-05 16:30:34 +01:00

bower.json

// update bower with latest bootstrap 3.0.0 + fix layout

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

config.rb

// Organize css/sass + backward compatibility WIP

2013-11-05 12:32:41 +01:00

index.php

// Welcome 2013

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