Skip to content

Remove possible fulltime statement and re-arange business part #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2016

Conversation

vuchl
Copy link
Contributor

@vuchl vuchl commented Oct 19, 2016

No description provided.

@chrisvfritz chrisvfritz merged commit a699a59 into vuejs:master Oct 19, 2016
dingyiming added a commit to volksbright/document-standard-vue that referenced this pull request Oct 20, 2016
* master:
  Remove possible fulltime statement and re-arange business part (vuejs#520)
  Fix an error in Component Example (vuejs#521)
  update component inline-template (vuejs#519)
  wrong id (typo) (vuejs#515)
  Set the default color for the search input (vuejs#516)
  fix link to single-file-components.html (vuejs#514)
  fix broken link to contributing guide, fixes vuejs#513

# Conflicts:
#	src/guide/index.md
#	src/guide/join.md
#	src/support-vuejs/index.md
Peter-WF pushed a commit to Peter-WF/vuefe.github.io that referenced this pull request Nov 18, 2016
…#520)

* Remove possible fulltime statementand re-arange business part

* Fix spacing in README
Peter-WF pushed a commit to Peter-WF/vuefe.github.io that referenced this pull request Nov 18, 2016
* master:
  Remove possible fulltime statement and re-arange business part (vuejs#520)
  Fix an error in Component Example (vuejs#521)
  update component inline-template (vuejs#519)
  wrong id (typo) (vuejs#515)
  Set the default color for the search input (vuejs#516)
  fix link to single-file-components.html (vuejs#514)
  fix broken link to contributing guide, fixes vuejs#513

# Conflicts:
#	src/guide/index.md
#	src/guide/join.md
#	src/support-vuejs/index.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants