From: Dan Brown <redacted>
Date: Sun, 10 Sep 2017 16:05:05 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.18.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9bde0ae4ea8ac0103cc794e1aba4f1e5dcc4757f

Merge branch 'master' into release
---

9bde0ae4ea8ac0103cc794e1aba4f1e5dcc4757f
diff --cc .gitignore
index d7281b29c,e7e053505..00602d29a
--- a/.gitignore
+++ b/.gitignore
@@@ -5,9 -5,10 +5,10 @@@ Homestead.yam
  /public/dist
  .idea
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
+ /public/build/
  /storage/images
  _ide_helper.php
  /storage/debugbar
diff --cc version
index 1c29999c8,de0ad7791..2a8eccd9e
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.17.4
 -v0.18-dev
++v0.18