Commit Graph

5 Commits

Author SHA1 Message Date
mespeche
ba645764fc Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	reset_install.sh
2013-09-04 16:05:25 +02:00
mespeche
2cd2c6bc59 Working : Fix script reset 2013-09-04 15:52:16 +02:00
Manuel Raynaud
1496f51c0e refactor reset_install script 2013-09-03 11:14:44 +02:00
Manuel Raynaud
eeea885543 create new smarty function for displaying date in expected format 2013-09-02 23:36:34 +02:00
Manuel Raynaud
58484b6c80 add file reset_install.sh 2013-09-02 13:20:26 +02:00