Etienne Roudeix edc731d139 Merge branch 'argument', remote-tracking branch 'origin' ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Core/Template/TestLoop/Equal.php

2013-06-28 14:38:23 +02:00

..

admin/default

add 404 rule in admin

2013-06-26 10:45:43 +02:00

default

set execution right // no more troubles

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

smarty-sample

Merge branch 'argument', remote-tracking branch 'origin'

2013-06-28 14:38:23 +02:00

.gitkeep

set execution right // no more troubles

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