]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into 2019-design
authorDan Brown <redacted>
Sun, 10 Mar 2019 21:40:02 +0000 (21:40 +0000)
committerDan Brown <redacted>
Sun, 10 Mar 2019 21:40:02 +0000 (21:40 +0000)
commit5f2d226f09229566de24f0f6ff526eaf9ade9e1f
tree1b4003c6f967a9f327a57362db6e3e4bc6036492
parent035a0d8efb1769d2816c1ebedb3f7cf12db1637e
parent00703fa817ebd444ec2cff8438f9c6f2397d4678
Merge branch 'master' into 2019-design
app/Http/Controllers/PageController.php
app/Settings/SettingService.php
app/helpers.php
resources/assets/js/components/wysiwyg-editor.js
resources/assets/sass/_pages.scss
resources/views/common/header.blade.php
resources/views/pages/show.blade.php
resources/views/users/edit.blade.php