From: Dan Brown <redacted>
Date: Sun, 6 Mar 2016 09:08:20 +0000 (+0000)
Subject: Merge branch 'master' into nwalke-update_site_color
X-Git-Tag: v0.7.6~1^2~3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0774ecc89c23d067296abac0298c2e02120917df

Merge branch 'master' into nwalke-update_site_color
---

0774ecc89c23d067296abac0298c2e02120917df