Merge branch 'develop'

SerhoLiu · Aug 13, 2013 · 0f0e75b · 0f0e75b
2 parents aaaba66 + e7e1b4c
commit 0f0e75b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/miniakio/static/style/effector.less b/miniakio/static/style/effector.less
@@ -1,4 +1,4 @@
-@import "reset.css";
+@import "reset.less";
 
 //基本样式
 @link-color: #F95B1F;

diff --git a/miniakio/static/style/reset.css → miniakio/static/style/reset.less b/miniakio/static/style/reset.css → miniakio/static/style/reset.less