Manuel Raynaud 8b2007f94d Merge branch 'actions' ...

Conflicts:
	core/lib/Thelia/Action/Currency.php
	core/lib/Thelia/Core/Event/TheliaEvents.php

2013-09-04 10:53:32 +02:00

..

AdminController.php

Completed the backoffice variable management

2013-09-02 00:17:27 +02:00

BaseAdminController.php

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

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

CategoryController.php

Added AdminUtilities Smarty plugin, optimized templates

2013-09-03 15:43:05 +02:00

ConfigController.php

Merge branch 'actions'

2013-09-04 10:53:32 +02:00

CurrencyController.php

Merge branch 'actions'

2013-09-04 10:53:32 +02:00

MessageController.php

Merge branch 'actions'

2013-09-04 10:53:32 +02:00

SessionController.php

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

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