merge upstream

2016-11-15 09:34:03 +08:00 · 2016-11-15 09:34:03 +08:00 · 6924d5dbc7
commit 6924d5dbc7
parent abedec0813 3799985d5d
15 changed files with 8 additions and 13223 deletions
--- a/test/index.html
+++ b/test/index.html
@ -3,7 +3,7 @@
 <head>
    <meta charset="UTF-8">
    <title>iView test page</title>
-    <link href="/test/dist/main.css" rel="stylesheet"></head>
+    <link href="/test/dist/main.css" rel="stylesheet">
 </head>
 <body>
    <div id="app"></div>