From 541c2385dd33fb2bb23674dbe5e9ebbcb4cdb6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sajn=C3=B3g?= <msajnog93@gmail.com>
Date: Tue, 15 Aug 2017 16:45:12 +0200
Subject: [PATCH] v3.12.0

---
 README.md                | 5 ++++-
 lib/recommended-rules.js | 3 +++
 package.json             | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a6d61292a..8fda2f0d8 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ The `--fix` option on the command line automatically fixes problems reported by
 |:---|:--------|:------------|
 |  | [no-dupe-keys](./docs/rules/no-dupe-keys.md) | Prevents duplication of field names. |
 | :white_check_mark: | [no-parsing-error](./docs/rules/no-parsing-error.md) | disallow parsing errors in `<template>`. |
-|  | [no-reservered-keys](./docs/rules/no-reservered-keys.md) | Prevent overwrite reserved keys. |
+|  | [no-reserved-keys](./docs/rules/no-reserved-keys.md) | Prevent overwrite reserved keys. |
 |  | [no-shared-component-data](./docs/rules/no-shared-component-data.md) | Enforces component's data property to be a function. |
 |  | [no-template-key](./docs/rules/no-template-key.md) | disallow `key` attribute on `<template>`. |
 |  | [require-render-return](./docs/rules/require-render-return.md) | Enforces render function to always return value. |
@@ -139,7 +139,9 @@ The `--fix` option on the command line automatically fixes problems reported by
 | :wrench: | [attribute-hyphenation](./docs/rules/attribute-hyphenation.md) | Define a style for the props casing in templates. |
 |  | [html-quotes](./docs/rules/html-quotes.md) | enforce quotes style of HTML attributes. |
 | :wrench: | [html-self-closing](./docs/rules/html-self-closing.md) | enforce self-closing style. |
+|  | [max-attributes-per-line](./docs/rules/max-attributes-per-line.md) | Define the number of attributes allows per line |
 | :wrench: | [name-property-casing](./docs/rules/name-property-casing.md) | Requires specific casing for the name property in Vue components |
+| :wrench: | [no-multi-spaces](./docs/rules/no-multi-spaces.md) | This rule warns about the usage of extra whitespaces between attributes |
 | :wrench: | [v-bind-style](./docs/rules/v-bind-style.md) | enforce `v-bind` directive style. |
 | :wrench: | [v-on-style](./docs/rules/v-on-style.md) | enforce `v-on` directive style. |
 
@@ -172,6 +174,7 @@ The `--fix` option on the command line automatically fixes problems reported by
 | [no-invalid-v-pre](./rules/no-invalid-v-pre.md) | [valid-v-pre](./rules/valid-v-pre.md) |
 | [no-invalid-v-show](./rules/no-invalid-v-show.md) | [valid-v-show](./rules/valid-v-show.md) |
 | [no-invalid-v-text](./rules/no-invalid-v-text.md) | [valid-v-text](./rules/valid-v-text.md) |
+| [no-reservered-keys](./rules/no-reservered-keys.md) | [no-reserved-keys](./rules/no-reserved-keys.md) |
 
 <!--RULES_TABLE_END-->
 
diff --git a/lib/recommended-rules.js b/lib/recommended-rules.js
index 02c13c1b8..3d4f60485 100644
--- a/lib/recommended-rules.js
+++ b/lib/recommended-rules.js
@@ -10,6 +10,7 @@ module.exports = {
   "vue/html-quotes": "off",
   "vue/html-self-closing": "off",
   "vue/jsx-uses-vars": "error",
+  "vue/max-attributes-per-line": "off",
   "vue/name-property-casing": "off",
   "vue/no-async-in-computed-properties": "off",
   "vue/no-confusing-v-for-v-if": "error",
@@ -29,7 +30,9 @@ module.exports = {
   "vue/no-invalid-v-pre": "off",
   "vue/no-invalid-v-show": "off",
   "vue/no-invalid-v-text": "off",
+  "vue/no-multi-spaces": "off",
   "vue/no-parsing-error": "error",
+  "vue/no-reserved-keys": "off",
   "vue/no-reservered-keys": "off",
   "vue/no-shared-component-data": "off",
   "vue/no-side-effects-in-computed-properties": "off",
diff --git a/package.json b/package.json
index 12917f314..b12c22b53 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-vue",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "Official ESLint plugin for Vue.js",
   "main": "lib/index.js",
   "scripts": {