From: Dan Brown <redacted>
Date: Sat, 14 Jan 2017 17:30:49 +0000 (+0000)
Subject: Merge branch 'patch-2' of git://github.com/fredericmohr/BookStack into fredericmohr... 
X-Git-Tag: v0.14.0~1^2~13
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e211f313704d3a0a00d8d358bd49eb310f9531c5

Merge branch 'patch-2' of git://github.com/fredericmohr/BookStack into fredericmohr-patch-2
---

e211f313704d3a0a00d8d358bd49eb310f9531c5