]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5795e12 2ad59f2)
Merge branch 'master' of github.com:ssddanbrown/BookStack
authorDan Brown <redacted>
Wed, 14 Oct 2015 21:13:08 +0000 (22:13 +0100)
committerDan Brown <redacted>
Wed, 14 Oct 2015 21:13:08 +0000 (22:13 +0100)

Trivial merge
The core source code for the BookStack project.