]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ff2c0b 28a5bd2)
Merge branch 'master' of github.com:BookStackApp/BookStack
authorDan Brown <redacted>
Sat, 17 Mar 2018 13:05:37 +0000 (13:05 +0000)
committerDan Brown <redacted>
Sat, 17 Mar 2018 13:05:37 +0000 (13:05 +0000)

Trivial merge
The core source code for the BookStack project.