Merge branch 'release-12-0-1'

# Conflicts: # CHANGELOG.md
stylelint · Dec 25, 2019 · 42f9bf2 · 42f9bf2
2 parents fbd403f + 1da39d6
commit 42f9bf2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ All notable changes to this project are documented in this file.
 -   Fixed: `value-list-comma-newline-after` false positives for shared-line comments ([#4482](https://github.com/stylelint/stylelint/pull/4482)).
 -   Fixed: consistently check that selectors are standard before passing to the parser ([#4483](https://github.com/stylelint/stylelint/pull/4483)).
 
+## 12.0.1
+
+-   Fixed: `string-no-newline` memory leak for ERB templates ([#4491](https://github.com/stylelint/stylelint/pull/4491)).
+
 ## 12.0.0
 
 -   Removed: ignoring `bower_components` folder by default ([#4384](https://github.com/stylelint/stylelint/pull/4384)).

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "description": "A mighty, modern CSS linter.",
   "keywords": [
     "css",