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

# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : BugFix Cancel modification button error
  [+] BO : Product "For" and combination button
  // update order tab
  [+] BO : Product "For"
  [+] BO : Product "For" and new carriers select list

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

2013-07-25 19:21:59 +02:00

..

components

// some work on style sheets

2013-07-18 18:51:24 +02:00

css

no message

2013-07-25 19:18:54 +02:00

font

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

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

img

// Css cleaning

2013-07-19 18:41:15 +02:00

js

// field translatable + tpl products + fixs

2013-07-10 19:39:35 +02:00

template

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

2013-07-25 19:21:59 +02:00

bower.json

[+] Helper form WIP

2013-07-16 19:23:46 +02:00

codekit-config.json

// fix merge

2013-07-24 17:02:23 +02:00

config.rb

// BO fix + work on helpers + compass/codekit config

2013-07-22 16:43:16 +02:00

index.php

// Welcome 2013

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