Merge branch 'dev'

pooya parsa · pooya parsa · commit 6e9d2cd4a1c0 · 2019-02-15T00:29:54.000+03:30
diff --git a/docs/nuxt.config.js b/docs/nuxt.config.js
@@ -71,6 +71,7 @@ module.exports = {
 
   manifest: {
     name: 'BootstrapVue',
+    short_name: 'BootstrapVue',
     description: 'Quickly integrate Bootstrap 4 components with Vue.js',
     theme_color: '#563d7c'
   },
diff --git a/package.json b/package.json
@@ -118,7 +118,7 @@
     "node-sass": "^4.11.0",
     "nuxt": "^2.4.3",
     "postcss-cli": "^6.1.1",
-    "prettier": "1.16.4",
+    "prettier": "1.14.3",
     "rollup": "^1.1.2",
     "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-commonjs": "^9.2.0",
diff --git a/yarn.lock b/yarn.lock
@@ -8602,16 +8602,16 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
+prettier@1.14.3:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
+  integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
+
 prettier@1.16.3:
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
   integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
 
-prettier@1.16.4:
-  version "1.16.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
-  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
-
 pretty-bytes@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.1.0.tgz#6237ecfbdc6525beaef4de722cc60a58ae0e6c6d"
