]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c10d2a1 0fb1fc8)
Merge branch 'master' into release
authorDan Brown <redacted>
Sun, 13 Nov 2016 12:26:56 +0000 (12:26 +0000)
committerDan Brown <redacted>
Sun, 13 Nov 2016 12:26:56 +0000 (12:26 +0000)
1  2 
.gitignore patch | diff1 | diff2 | blob | history

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