From: Dan Brown <redacted>
Date: Mon, 8 Feb 2016 20:45:48 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.7.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b97e792c5f49ca84cd6baae4d1354fa3fa666aba

Merge branch 'master' into release
---

b97e792c5f49ca84cd6baae4d1354fa3fa666aba
diff --cc .gitignore
index 3f3dfdc3d,69f0e2909..65c56ebbb
--- a/.gitignore
+++ b/.gitignore
@@@ -5,9 -5,8 +5,8 @@@ Homestead.yam
  /public/dist
  .idea
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
- /public/uploads
  /public/bower
  /storage/images
  _ide_helper.php