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

Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl

2013-11-18 15:13:04 +01:00

..

css

// backward compatibility remix WIP

2013-11-13 20:11:22 +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

// Hide collapse and expand button when not necessary

2013-11-14 19:21:31 +01:00

scss

// backward compatibility remix WIP

2013-11-13 20:11:22 +01:00

template

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

2013-11-18 15:13:04 +01:00

bower.json

// update bootstrap + add enquire.js

2013-11-07 14:19:23 +01:00

config.rb

// mobile nav

2013-11-08 16:18:28 +01:00

index.php

// Welcome 2013

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