]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65874d7 380f0f2)
Merge branch 'master' into release ready for v0.14
authorDan Brown <redacted>
Sun, 22 Jan 2017 12:31:27 +0000 (12:31 +0000)
committerDan Brown <redacted>
Sun, 22 Jan 2017 12:31:27 +0000 (12:31 +0000)
1  2 
.gitignore patch | diff1 | diff2 | blob | history

diff --cc .gitignore
Simple merge
The core source code for the BookStack project.