Skip to content

Commit f354bd4

Browse files
phananphanan
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # README.md # src/CNAME # src/v2/guide/components.md # src/v2/guide/computed.md # src/v2/guide/events.md # src/v2/guide/filters.md # src/v2/guide/index.md # src/v2/guide/installation.md # src/v2/guide/instance.md # src/v2/guide/list.md # src/v2/guide/migration.md # src/v2/guide/render-function.md # src/v2/guide/syntax.md # src/v2/guide/team.md # themes/vue/_config.yml # themes/vue/layout/index.ejs # themes/vue/layout/page.ejs # themes/vue/layout/partials/sidebar.ejs # themes/vue/layout/partials/sponsors.ejs # themes/vue/layout/partials/support_vue_dropdown.ejs
2 parents b353307 + f6e4596 commit f354bd4

Some content is hidden

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

77 files changed

+13881
-1340
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2015 Yuxi Evan You
3+
Copyright (c) 2013-present Yuxi Evan You
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile

-16
This file was deleted.

‎assets/props_and_events.ai

+7,527
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)