From: Dan Brown <redacted>
Date: Fri, 6 Oct 2017 20:04:49 +0000 (+0100)
Subject: Merge branch 'master' into release, Updated version
X-Git-Tag: v0.18.3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/tags/v0.18.3

Merge branch 'master' into release, Updated version
---

16117d329c14020474e5ec35851c70e9b20eb76c
diff --cc version
index c3990df25,de0ad7791..131c55b2c
--- a/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.18.2
 -v0.18-dev
++v0.18.3