Merge pull request #1660 from thejamespower/pull-request

Update CSSComb to v4.0.1.

CHANGELOG.md

@@ -2,6 +2,9 @@
 - Fix [#1524](https://github.com/Glavin001/atom-beautify/issues/1524). Add PHP-CS-Fixer config file setting and improve automatic detection of standard config files. See [#1661](https://github.com/Glavin001/atom-beautify/pull/1661)
 - ...
 
+# v0.29.25 (2017-05-12)
+- Fix [#1547](https://github.com/Glavin001/atom-beautify/issues/1547), [#1630](https://github.com/Glavin001/atom-beautify/issues/1630). Update CSSComb to latest version.
+
 # v0.29.24 (2017-05-06)
 - Fix [#1643](https://github.com/Glavin001/atom-beautify/issues/1643). Add PHPCBF Version setting and remove "--no-patch" option from version 3.0 of PHPCBF. See [#1645](https://github.com/Glavin001/atom-beautify/pull/1645).
 - Close [#27](https://github.com/Glavin001/atom-beautify/issues/27). Add commands for beautifying a specific language

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom-beautify",
   "main": "./src/beautify",
-  "version": "0.29.24",
+  "version": "0.29.25",
   "private": true,
   "description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, Coldfusion, SQL, and more in Atom",
   "repository": {
@@ -134,6 +134,10 @@
     {
       "name": "Taylon Silmer",
       "url": "https://github.com/taylon"
+    },
+    {
+      "name": "James Power",
+      "url": "https://github.com/thejamespower"
     }
   ],
   "engines": {
@@ -148,7 +152,7 @@
     "coffee-fmt": "^0.12.0",
     "coffee-formatter": "^0.1.2",
     "coffee-script": "^1.11.0",
-    "csscomb": "^3.1.7",
+    "csscomb": "^4.0.1",
     "diff": "3.0.0",
     "editorconfig": "^0.13.2",
     "eslint": "^3.13.1",
@@ -399,4 +403,4 @@
     "lint": "coffeelint src/ spec/",
     "code-docs": "codo && open docs/code/index.html"
   }
-}
+}