From: James Geiger <redacted>
Date: Thu, 3 Dec 2020 17:39:06 +0000 (-0600)
Subject: Merge pull request #1 from BookStackApp/master
X-Git-Tag: v21.08~1^2~35^2~4
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4b36df08a80f467c037de3bbdf85e13cd4cef9bc?ds=inline;hp=--cc

Merge pull request #1 from BookStackApp/master

Update from base/master
---

4b36df08a80f467c037de3bbdf85e13cd4cef9bc