franck 8bd7a6413d Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html

2013-09-06 16:18:54 +02:00

..

Action

Before merging coupon

2013-09-05 10:00:17 +02:00

Cart

add some phpdoc

2013-09-01 11:32:05 +02:00

Command

clear asset cache in cache:cler command

2013-09-06 09:58:35 +02:00

Config

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

2013-09-06 16:18:54 +02:00

Controller

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

2013-09-06 16:18:54 +02:00

Core

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

2013-09-06 16:18:54 +02:00

Exception

rewriting

2013-09-03 16:51:41 +02:00

Form

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

2013-09-06 16:18:54 +02:00

Install

create task for reloaded database

2013-09-03 11:07:32 +02:00

Log

apply cs-fixer

2013-08-14 09:29:04 +02:00

Model

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

2013-09-05 23:30:50 +02:00

Module

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

Rewriting

rewriting router

2013-09-06 08:59:06 +02:00

Tests

fix test suite

2013-09-06 10:08:30 +02:00

Tools

rewriting router

2013-09-06 08:59:06 +02:00

Type

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00