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

1 Commits

Author SHA1 Message Date
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