From: Dan Brown <redacted>
Date: Sun, 4 Feb 2018 18:14:16 +0000 (+0000)
Subject: Merge branch 'pixwell-dev-support_for_gitlub_auth'
X-Git-Tag: v0.20.0~1^2~7
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/87a45edde94025f18205ed125d54724cdc30d2e9?hp=-c

Merge branch 'pixwell-dev-support_for_gitlub_auth'
---

87a45edde94025f18205ed125d54724cdc30d2e9