aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitermayer <mitermayer.reis@gmail.com>2018-05-02 17:05:56 -0700
committermitermayer <mitermayer.reis@gmail.com>2018-05-02 17:05:56 -0700
commitb3183e39ac2a485a228207922eedeb2791e20ee6 (patch)
tree60ca8b03f4b6dcb7b51cf4941c99f6901cd091db
parenta9326e2596c56b7717562b9dc7f749c7c5faf7b4 (diff)
parenta222bfa3e02b54ece1022134c17784bf23fcbaca (diff)
downloadvim-prettier-b3183e39ac2a485a228207922eedeb2791e20ee6.tar.xz
Merge branch 'master' into release/1.x
-rw-r--r--.gitignore1
-rw-r--r--README.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index f7fb9fb..065e568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
TODO
node_modules
.yarn_lock
+yarn.lock
diff --git a/README.md b/README.md
index a2917ae..25ad9a9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## vim-prettier [![Travis CI Build Status](https://travis-ci.org/prettier/vim-prettier.svg?branch=master)](https://travis-ci.org/prettier/vim-prettier)
+## vim-prettier [![Travis CI Build Status](https://travis-ci.org/prettier/vim-prettier.svg?branch=master)](https://travis-ci.org/prettier/vim-prettier) [![Discord](https://img.shields.io/discord/435481502113857536.svg)](https://discord.gg/9bWM9PH)
A vim plugin wrapper for prettier, pre-configured with custom default prettier
settings.