gmorel b9577e87e3 Merge branch 'master' of https://github.com/thelia/thelia into coupon ...

# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less

2013-09-04 16:23:16 +02:00

..

assets

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 16:11:51 +02:00

coupon

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 16:23:16 +02:00

includes

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 16:11:51 +02:00

404.html

Smarty inheritance in admin template.

2013-09-03 11:26:03 +02:00

admin-layout.tpl

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

categories.html

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 16:11:51 +02:00

configuration.html

Working : Major class changes migration from bootstrap 2.x to 3.0

2013-09-04 11:35:22 +02:00

coupon-create.html

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 12:01:12 +02:00

coupon-edit.html

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 12:01:12 +02:00

coupon-list.html

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 12:01:12 +02:00

coupon-read.html

Merge branch 'master' of https://github.com/thelia/thelia into coupon

2013-09-04 12:01:12 +02:00

currencies.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

currency-edit.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

edit_category.html

Working : Major class changes migration from bootstrap 2.x to 3.0

2013-09-04 11:35:22 +02:00

general_error.html

Working : Major class changes migration from bootstrap 2.x to 3.0

2013-09-04 11:35:22 +02:00

home.html

Working : Major class changes migration from bootstrap 2.x to 3.0

2013-09-04 11:35:22 +02:00

login.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

message-edit.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

messages.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

variable-edit.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

variables.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00