Skip to content

Conversation

@creeperyang
Copy link
Contributor

No description provided.

@LinusBorg LinusBorg closed this Jan 13, 2018
@LinusBorg LinusBorg reopened this Jan 13, 2018
@LinusBorg LinusBorg merged commit 464b638 into vuejs-templates:develop Jan 13, 2018
LinusBorg added a commit that referenced this pull request Jan 13, 2018
* develop:
  bump template version (1.3.0)
  chore: remove extra comma (#1240)
  Improve template CI tests (close #1218)
  Revert "fix bad alias (fix #1239)"
  Typo, whitespace and Style Guide fixes (#1231)
  Update runner.js (#1235)
  remove unnecessary option.
  bumping eslint dependencies
  fix bad alias (fix #1239)
  remove duplicate lines in gitignore (#1214)
  fix historyFallback rewrite for Windows systems
  improved comments in eslintrc
  updated linting docs.
  respect eslint rule for order of options.
  switch to essential ruleset.
  add eslint-plugin-vue

# Conflicts:
#	template/build/build.js
c0defre4k added a commit to neonblack-at/webpack that referenced this pull request Jan 23, 2018
* vuejs-templates/master: (66 commits)
  Bump template version (1.3.1)
  change circleci node image to 6.12.3 to ensure node 6 compat.
  replace object rest spread with Object.assign for node6 compat. (fix
vuejs-templates#1245)
  bump template version (1.3.0)
  chore: remove extra comma (vuejs-templates#1240)
  Improve template CI tests (close vuejs-templates#1218)
  Revert "fix bad alias (fix vuejs-templates#1239)"
  Typo, whitespace and Style Guide fixes (vuejs-templates#1231)
  Update runner.js (vuejs-templates#1235)
  remove unnecessary option.
  bumping eslint dependencies
  fix bad alias (fix vuejs-templates#1239)
  fix history fallback for windows.
  remove duplicate lines in gitignore (vuejs-templates#1214)
  fix historyFallback rewrite for Windows systems
  improved comments in eslintrc
  updated linting docs.
  respect eslint rule for order of options.
  switch to essential ruleset.
  add eslint-plugin-vue
  ...

# Conflicts:
#	meta.js
#	template/package.json
#	template/src/components/HelloWorld.vue
#	template/src/main.js
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