]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a533ff e6fe299)
Merge branch 'settings-color-selector' of git://github.com/james-geiger/BookStack...
authorDan Brown <redacted>
Sat, 7 Dec 2019 20:36:39 +0000 (20:36 +0000)
committerDan Brown <redacted>
Sat, 7 Dec 2019 20:36:39 +0000 (20:36 +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.