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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html

2013-09-04 17:40:34 +02:00

..

Action

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

2013-09-04 17:34:23 +02:00

Cart

add some phpdoc

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

Command

refactor install process, database management in dedicated class

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

Config

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

2013-09-04 17:40:34 +02:00

Controller

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

2013-09-04 17:34:23 +02:00

Core

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

2013-09-04 17:34:23 +02:00

Exception

rewriting

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

Form

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

2013-09-04 17:34:23 +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-04 17:34:23 +02:00

Module

Merge branch 'master' into loops

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

Rewriting

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

2013-09-04 17:34:23 +02:00

Tests

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

2013-09-04 17:34:23 +02:00

Tools

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

2013-09-04 17:34:23 +02:00

Type

Merge branch 'master' into loops

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