From: Dan Brown <redacted>
Date: Sun, 8 Jan 2017 18:43:33 +0000 (+0000)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.14.0~1^2~17
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/f7f86ff8214702b804636f105e183bd82dabe3b5

Merge branch 'master' of github.com:BookStackApp/BookStack
---

f7f86ff8214702b804636f105e183bd82dabe3b5