]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ad21ce 5e21ecc)
Merge branch 'master' into release
authorDan Brown <redacted>
Tue, 1 Dec 2015 21:15:08 +0000 (21:15 +0000)
committerDan Brown <redacted>
Tue, 1 Dec 2015 21:15:08 +0000 (21:15 +0000)

Trivial merge
The core source code for the BookStack project.