Skip to content
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

Add .vscode to gitignore #845

Merged
merged 1 commit into from
Sep 30, 2017

Conversation

ACollectionOfAtoms
Copy link
Contributor

No description provided.

@LinusBorg LinusBorg changed the base branch from master to develop September 30, 2017 12:01
@LinusBorg LinusBorg merged commit 5218c7b into vuejs-templates:develop Sep 30, 2017
frandiox pushed a commit to OnsenUI/vue-cordova-webpack that referenced this pull request Oct 13, 2017
c0defre4k pushed a commit to neonblack-at/webpack that referenced this pull request Oct 30, 2017
* vuejs-templates/master: (29 commits)
  Fix missing dependency bumps (vuejs-templates#987)
  Bumping Vue+VueRouter versions, some minor fixes. (vuejs-templates#986)
  stick to ES5
  v1.1.1
  downgrade airbnb config to ensure compaibility with eslint.
  Typo fixed: 'use stxrict' -> 'use strict' (vuejs-templates#955)
  We now have port-detection, so README should reflect that.
  Revision of wording in the README docs (vuejs-templates#958)
  add version tag to config/index.js
  add version tag to config/index.js
  Reference dev script in start script instead of copy pasting (vuejs-templates#894)
  Reference dev script in start script instead of copy pasting (vuejs-templates#894)
  Put hotMiddleware before proxyMiddleware in dev server (vuejs-templates#837)
  fix component filename
  Rename Hello component to HelloWorld (vuejs-templates#944)
  bump more deps
  Add .vscode to gitignore (vuejs-templates#845)
  update URL of ESLint to https (vuejs-templates#927)
  Fix small errors in webpack.prod.conf (vuejs-templates#897)
  Standardize base webpack module variable name (vuejs-templates#912)
  ...

# Conflicts:
#	template/build/dev-server.js
#	template/build/webpack.prod.conf.js
#	template/package.json
#	template/src/components/HelloWorld.vue
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