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

Conflicts:
	templates/admin/default/category-edit.html

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

..

admin/default

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

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

default

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

2013-09-19 16:24:05 +02:00

default_save

fix current url bug + fix empty loop pagination exception

2013-09-12 17:20:33 +02:00

.gitkeep

set execution right // no more troubles

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