Kevin Granger 8848ff08d8 // test git ...

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

Conflicts:
	controllers/admin/AdminImportController.php

2013-11-28 14:29:34 +01:00

..

css

// Import WIP (still broken for first upload)

2013-11-27 19:33:36 +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

// load jquery-timeago.js

2013-11-27 15:15:30 +01:00

scss

// Import WIP (still broken for first upload)

2013-11-27 19:33:36 +01:00

template

// test git

2013-11-28 14:29:34 +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