]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b7bee7 4ee0fde)
Merge branch 'master' into 2019-design
authorDan Brown <redacted>
Sat, 30 Mar 2019 13:17:29 +0000 (13:17 +0000)
committerDan Brown <redacted>
Sat, 30 Mar 2019 13:17:29 +0000 (13:17 +0000)
1  2 
resources/lang/en/settings.php patch | diff1 | diff2 | blob | history

diff --cc resources/lang/en/settings.php
Simple merge
The core source code for the BookStack project.