TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	templates/admin/default/currencies.html
This commit is contained in:
franck
2013-09-05 23:30:50 +02:00
parent c276ab236e baa1df6d59
commit 318fb3bf2d
15 changed files with 167 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/admin/default/assets/less/main.less
View File

@@ -3,4 +3,6 @@
/* Thelia Admin */
@import "thelia/thelia.less";
// @import "thelia/responsive.less";
// @import "thelia/responsive.less";
//mmm