Merge remote-tracking branch 'upstream/master' into patch-1

2018-03-03 20:10:51 +00:00 · 2018-03-03 20:10:51 +00:00 · ffe5f5fa9a
parent 6aa51fdf78 386601934b
commit ffe5f5fa9a
3 changed files with 1851 additions and 1219 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,5 @@
 # Next
+- Update Prettier to 1.11.1. (#2060)
 - ...

 # v0.32.0 (2018-03-02)
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -200,7 +200,7 @@
    "node-cljfmt": "0.5.3",
    "node-dir": "0.1.17",
    "open": "0.0.5",
-    "prettier": "^1.10.2",
+    "prettier": "^1.11.1",
    "prettydiff2": "^2.2.7",
    "pug-beautify": "^0.1.1",
    "remark": "6.0.1",