From: Dan Brown <redacted>
Date: Thu, 27 Jul 2017 15:29:09 +0000 (+0100)
Subject: Merge branch 'Cyber-Duck-master'
X-Git-Tag: v0.17.4~1^2~3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9d61eecd811f8f8f4acc11a17e16c9d53d68525a

Merge branch 'Cyber-Duck-master'
---

9d61eecd811f8f8f4acc11a17e16c9d53d68525a