TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,470 Commits 1 Branch 0 Tags
e27b3cfbaee509a2e6edfc740524f846f72c6a79
Commit Graph

2 Commits

Author SHA1 Message Date
franck
e27b3cfbae Working catalog branch 2013-09-20 15:54:50 +02:00
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