Merge branch '2.0' into anchor

2018-06-20 11:00:05 +08:00 · 2018-06-20 11:00:05 +08:00 · 754eedf571
commit 754eedf571
parent 1287ac7f8c 92ffd65dda
156 changed files with 61134 additions and 18815 deletions
--- a/examples/app.vue
+++ b/examples/app.vue
@ -63,6 +63,7 @@ nav {
                <li><router-link to="/color-picker">ColorPicker</router-link></li>
                <li><router-link to="/auto-complete">AutoComplete</router-link></li>
                <li><router-link to="/scroll">Scroll</router-link></li>
+                <li><router-link to="/time">Time</router-link></li>
            </ul>
        </nav>
        <router-view></router-view>