From: Dan Brown <redacted>
Date: Fri, 6 Mar 2020 19:49:16 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/JHenneberg/BookStack into JHenneberg-master
X-Git-Tag: v0.28.3~1^2~20
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4b2654598c39d3613a4e05470470555a6f743988

Merge branch 'master' of git://github.com/JHenneberg/BookStack into JHenneberg-master
---

4b2654598c39d3613a4e05470470555a6f743988