]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
chore: Merge branch 'v2-compat'
authorEvan You <yyx990803@gmail.com>
Wed, 28 Apr 2021 16:30:57 +0000 (12:30 -0400)
committerEvan You <yyx990803@gmail.com>
Wed, 28 Apr 2021 16:30:57 +0000 (12:30 -0400)
1  2 
packages/runtime-core/src/components/KeepAlive.ts
packages/runtime-core/src/renderer.ts

Simple merge