]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into 129-page-templates
authorDan Brown <redacted>
Sun, 4 Aug 2019 15:26:38 +0000 (16:26 +0100)
committerDan Brown <redacted>
Sun, 4 Aug 2019 15:26:38 +0000 (16:26 +0100)
commit2ebbc6b658e80c1a291de9d699627c82ed07577f
tree564c7ed38648374fdd7e219d027453e53e6f4b22
parent71167426bb5196483b85ebcaecc33745bcfa25b6
parent0b1ece664db7bb514e1a9e556964689bbbac2f49
Merge branch 'master' into 129-page-templates
resources/assets/sass/_pages.scss
resources/lang/en/settings.php
resources/views/pages/edit.blade.php
resources/views/settings/roles/form.blade.php