From: Justin Stein <redacted>
Date: Sun, 4 Nov 2018 19:04:30 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/BookStackApp/BookStack
X-Git-Tag: v0.24.2~3^2~2^2~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/89de328439729a70b7faafc72c38c08489a436a3

Merge branch 'master' of https://github.com/BookStackApp/BookStack
---

89de328439729a70b7faafc72c38c08489a436a3