Etienne Roudeix 267e468a3f Merge branch 'loops' ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php

2013-07-08 12:02:58 +02:00

..

Action

change compatibility for propel2

2013-07-05 15:59:41 +02:00

Admin/Controller

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Command

Merge branch 'admin'

2013-06-26 11:05:48 +02:00

Config

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

2013-07-08 11:43:57 +02:00

Controller

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Core

Merge branch 'loops'

2013-07-08 12:02:58 +02:00

Exception

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Form

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Log

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Model

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Routing

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Tests

Merge branch 'admin'

2013-07-08 11:27:37 +02:00

Tools

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Type

new types

2013-07-03 10:52:24 +02:00