]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into feature/edit-link-headers
authorDan Brown <redacted>
Sat, 14 Jul 2018 08:36:14 +0000 (09:36 +0100)
committerDan Brown <redacted>
Sat, 14 Jul 2018 08:36:14 +0000 (09:36 +0100)
commitf668bee88bbcd45efeba2f43a2346d4a9b8b6b67
tree635dcdc5d77bd48111e0c05f4f2d33001f414a85
parent771f781e7faf5823bf3aee905ab5610674149ad2
parentc2d6e9898597266e9703a30a917ce83904c58ec1
Merge branch 'master' into feature/edit-link-headers
resources/assets/js/components/page-display.js
resources/assets/sass/_pages.scss
resources/lang/es/entities.php