Merge branch 'master' of https://github.com/uxsi/weui

Conflicts: dist/style/weui.css dist/style/weui.min.css
vangogogo · Dec 17, 2015 · 245efa1 · 245efa1
2 parents f88de4a + c150cf6
commit 245efa1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 46 deletions.
diff --git a/dist/style/weui.css b/dist/style/weui.css