 Kevin Granger
|
77f80b1774
|
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
.gitignore
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/page.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/orders/_documents.tpl
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/modules_list/list.tpl
classes/Tools.php
controllers/admin/AdminCartRulesController.php
controllers/admin/AdminProductsController.php
css/admin.css
|
2013-07-24 17:01:23 +02:00 |
|
|
gRoussac
|
c90e574cb8
|
// Remove additionnal files from gitignore
|
2013-07-01 11:28:00 +02:00 |
|
|
Kevin Granger
|
86ef69c9ba
|
[*] BO : Init Bootstrap (Sass) BO
|
2013-06-13 18:03:34 +02:00 |
|
|
François Gaillard
|
a26ce970ff
|
// .gitignore updated
|
2013-04-03 16:17:33 +02:00 |
|
|
Francois Gaillard
|
d578075475
|
// .gitignore updated
|
2013-04-03 16:17:33 +02:00 |
|
|
François Gaillard
|
ab061827b9
|
// Ignore list updated (en.php removed)
|
2013-03-25 15:01:59 +01:00 |
|
|
Francois Gaillard
|
3eef7892e2
|
// Ignore list updated (en.php removed)
|
2013-03-25 15:01:59 +01:00 |
|
|
François Gaillard
|
eeb84d8adf
|
// Ignore list updated + fr translations updated
|
2013-03-25 14:59:01 +01:00 |
|
|
Francois Gaillard
|
6d7ea35e97
|
// Ignore list updated + fr translations updated
|
2013-03-25 14:59:01 +01:00 |
|
|
François Gaillard
|
4cc977b065
|
// .DS_Store files added to .gitignore
|
2012-11-26 11:20:46 +01:00 |
|
|
Francois Gaillard
|
d5fc20435d
|
// .DS_Store files added to .gitignore
|
2012-11-26 11:20:46 +01:00 |
|
|
Vincent Augagneur
|
65eeb53992
|
//added .gitignore
|
2012-11-19 17:57:46 +01:00 |
|
|
Vincent Augagneur
|
32bebf5604
|
//added .gitignore
|
2012-11-19 17:57:46 +01:00 |
|