Integrate 1.5.3 hotfix (#2489)

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.5.3
+
+[link](https://github.com/jlongster/prettier/compare/1.5.2...1.5.3)
+
+* Force trailingComma option to "none" when parser is JSON (#2335)
+
 # 1.5.2
 
 [link](https://github.com/jlongster/prettier/compare/1.5.1...1.5.2)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Prettier is an opinionated code formatter",
   "bin": {
     "prettier": "./bin/prettier.js"

website/static/lib/index.js

@@ -1284,7 +1284,7 @@ var comments$1 = {
 };
 
 var name = "prettier";
-var version$1 = "1.5.2";
+var version$1 = "1.5.3";
 var description = "Prettier is an opinionated JavaScript formatter";
 var bin = { "prettier": "./bin/prettier.js" };
 var repository = "prettier/prettier";

website/static/lib/prettier-version.js

@@ -1 +1 @@
-prettierVersion = "1.5.2";
+prettierVersion = "1.5.3";