From: Dan Brown <redacted>
Date: Sat, 14 Sep 2019 13:21:24 +0000 (+0100)
Subject: Merge branch 'laravel-upgrade'
X-Git-Tag: v0.28.0~1^2~98
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1ee3e779e4b9b0a92f701a72f21a72c83cb1ce68

Merge branch 'laravel-upgrade'
---

1ee3e779e4b9b0a92f701a72f21a72c83cb1ce68