TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,514 Commits 1 Branch 0 Tags
7bc34d3d0f47be9c8fcf9b6ad182a71d44b41c5b
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