Merge branch 'master' of https://github.com/sentsin/layui

merge
layui · Sep 13, 2017 · 4fbd00e · 4fbd00e
2 parents 5a9b861 + 1dea654
commit 4fbd00e
Show file tree

Hide file tree

Showing 3 changed files with 541 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,4 +1,4 @@
-{
+{
   "name": "layui",
   "main": "src/layui.js",
   "version": "2.1.3",