From: Dan Brown <redacted>
Date: Sat, 21 Jan 2017 16:17:33 +0000 (+0000)
Subject: Merge branch 'page_transclusion'
X-Git-Tag: v0.14.0~1^2~4
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/5c60f27a7d3e10d7c3256a78f9e9b2068c8fe0f4

Merge branch 'page_transclusion'

Closes #123
---

5c60f27a7d3e10d7c3256a78f9e9b2068c8fe0f4