Commit a69f8ac

committed

Merge branch 'vuejs.org-master' into 2.0-cn # Conflicts: # src/v2/guide/installation.md

2 parents 13ee594 + 0cfd655 commit a69f8acCopy full SHA for a69f8ac

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ Vue.js 不支持 IE8 及其以下版本,因为 Vue.js 使用了 IE8 不能模`
`34`	`34`
`35`	`35`	`推荐:[unpkg](https://unpkg.com/vue/dist/vue.js), 会保持和 npm 发布的最新的版本一致。可以在 [unpkg.com/vue/](https://unpkg.com/vue/) 浏览 npm 包资源。`
`36`	`36`
`37`		`-也可以从 [jsdelivr](//cdn.jsdelivr.net/vue/{{vue_version}}/vue.js) 或 [cdnjs](//cdnjs.cloudflare.com/ajax/libs/vue/{{vue_version}}/vue.js)获取,不过这两个服务版本更新可能略滞后。`
	`37`	`+也可以从 [jsDelivr](//cdn.jsdelivr.net/vue/{{vue_version}}/vue.js) 或 [cdnjs](//cdnjs.cloudflare.com/ajax/libs/vue/{{vue_version}}/vue.js)获取,不过这两个服务版本更新可能略滞后。`
`38`	`38`
`39`	`39`	`## NPM`
`40`	`40`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<div id="header">`
`2`	`2`	`<a id="logo" href="/">`
`3`	`3`	`<img src="/images/logo.png">`
`4`		`- <span>Vue.js <span style="font-size: 12px;">(2017.02.01更新,祝大家新年快乐!)</span></span>`
	`4`	`+ <span>Vue.js <span style="font-size: 12px;">(2017.02.06更新,鸡年大吉!)</span></span>`
`5`	`5`	`</a>`
`6`	`6`	`<a style="`
`7`	`7`	`position: absolute;`

Lines changed: 2 additions & 1 deletion

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,13 +176,6 @@`
`176`	`176`
`177`	`177`	`var animating = false`
`178`	`178`	`sectionContainer.addEventListener('click', function (e) {`
`179`		`-<<<<<<< HEAD`
`180`		`-=======`
`181`		`-`
`182`		`- // Not prevent hashchange for smooth-scroll`
`183`		`- // e.preventDefault()`
`184`		`-`
`185`		`->>>>>>> vuejs.org-master`
`186`	`179`	`if (e.target.classList.contains('section-link')) {`
`187`	`180`	`sidebar.classList.remove('open')`
`188`	`181`	`setActive(e.target)`

Comments

(0)