From: Dan Brown <redacted>
Date: Sun, 10 Dec 2017 18:19:20 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.19.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8b30c7f02e781868a17e9d8ff0ef72e75a47f653

Merge branch 'master' into release
---

8b30c7f02e781868a17e9d8ff0ef72e75a47f653
diff --cc .gitignore
index 00602d29a,be86e5a03..a080d4df7
--- a/.gitignore
+++ b/.gitignore
@@@ -2,11 -2,13 +2,13 @@@
  /node_modules
  Homestead.yaml
  .env
- /public/dist
  .idea
+ npm-debug.log
+ yarn-error.log
+ /public/dist
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /public/build/
  /storage/images