From: Dan Brown <redacted>
Date: Sun, 4 Jun 2017 14:39:55 +0000 (+0100)
Subject: Merge branch 'v0.16'
X-Git-Tag: v0.17.0^2~14
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0528e98d9c7d09dca2e12dab8e2df703f8557f63

Merge branch 'v0.16'
---

0528e98d9c7d09dca2e12dab8e2df703f8557f63