]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26da81a 2d4034f)
Merge branch 'page_transclusion'
authorDan Brown <redacted>
Sat, 21 Jan 2017 16:17:33 +0000 (16:17 +0000)
committerDan Brown <redacted>
Sat, 21 Jan 2017 16:17:33 +0000 (16:17 +0000)
Closes #123


Trivial merge
The core source code for the BookStack project.