]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d759f9c a7e3c26)
Merge branch 'v0.31.x'
authorDan Brown <redacted>
Sat, 6 Feb 2021 14:22:19 +0000 (14:22 +0000)
committerDan Brown <redacted>
Sat, 6 Feb 2021 14:22:19 +0000 (14:22 +0000)
1  2 
composer.json patch | diff1 | diff2 | blob | history

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