]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ccfa0e 80f8441)
Merge branch 'v0.14'
authorDan Brown <redacted>
Wed, 1 Feb 2017 22:28:38 +0000 (22:28 +0000)
committerDan Brown <redacted>
Wed, 1 Feb 2017 22:28:38 +0000 (22:28 +0000)
1  2 
composer.json patch | diff1 | diff2 | blob | history

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