Skip to content

Commit da64b4a

Browse files
committed
Merge branch 'dev' into move_to_typescript
# Conflicts: # dist/vue.common.dev.js # dist/vue.common.prod.js # dist/vue.esm.browser.js # dist/vue.esm.browser.min.js # dist/vue.esm.js # dist/vue.js # dist/vue.min.js # dist/vue.runtime.common.dev.js # dist/vue.runtime.common.prod.js # dist/vue.runtime.esm.js # dist/vue.runtime.js # dist/vue.runtime.min.js # packages/vue-server-renderer/basic.js # packages/vue-server-renderer/build.dev.js # packages/vue-server-renderer/build.prod.js # packages/vue-server-renderer/client-plugin.js # packages/vue-server-renderer/server-plugin.js # packages/vue-template-compiler/browser.js # packages/vue-template-compiler/build.js # packages/weex-template-compiler/build.js # packages/weex-vue-framework/index.js # src/compiler/codegen/index.ts # src/core/components/keep-alive.ts # src/core/instance/lifecycle.js # src/core/instance/render-helpers/render-slot.ts # src/core/instance/state.ts # src/core/observer/watcher.ts # src/core/vdom/helpers/normalize-scoped-slots.ts # src/core/vdom/patch.ts # src/platforms/web/runtime/modules/events.ts # src/platforms/weex/entry-framework.ts # src/server/webpack-plugin/client.js # src/server/webpack-plugin/server.ts # src/server/webpack-plugin/util.ts # yarn.lock
2 parents f22b216 + 6aa1187 commit da64b4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+31490
-26652
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,7 @@ The default test script will do the following: lint with ESLint -> type check wi
124124

125125
## Financial Contribution
126126

127-
As a pure community-driven project without major corporate backing, we also welcome financial contributions via Patreon and OpenCollective.
128-
129-
- [Become a backer or sponsor on Patreon](https://www.patreon.com/evanyou)
130-
- [Become a backer or sponsor on OpenCollective](https://opencollective.com/vuejs)
131-
- [One-time donation via PayPal or crypto-currencies](https://vuejs.org/support-vuejs/#One-time-Donations)
132-
133-
### What's the difference between Patreon and OpenCollective funding?
134-
135-
Funds donated via Patreon go directly to support Evan You's full-time work on Vue.js. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses for core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform.
127+
As a pure community-driven project without major corporate backing, we also welcome financial contributions via GitHub Sponsors and OpenCollective. Please consult the [Sponsor Page](https://vuejs.org/sponsor/) for more details.
136128

137129
## Credits
138130

BACKERS.md

Lines changed: 3 additions & 482 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 17 additions & 278 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue",
3-
"version": "2.6.12",
3+
"version": "2.6.14",
44
"description": "Reactive, component-oriented view layer for modern web interfaces.",
55
"main": "dist/vue.runtime.common.js",
66
"module": "dist/vue.runtime.esm.js",

0 commit comments

Comments
 (0)