From: Dan Brown <redacted>
Date: Fri, 27 Dec 2019 17:15:45 +0000 (+0000)
Subject: Merge branch 'albergoniSivaf-master'
X-Git-Tag: v0.28.0~1^2~16
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/5c040bf2b71a8d2622dabc2a01fb9b4bbaa2ea6c

Merge branch 'albergoniSivaf-master'
---

5c040bf2b71a8d2622dabc2a01fb9b4bbaa2ea6c