]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into 2019-design
authorDan Brown <redacted>
Sun, 11 Nov 2018 11:44:35 +0000 (11:44 +0000)
committerDan Brown <redacted>
Sun, 11 Nov 2018 11:44:35 +0000 (11:44 +0000)
commit4a872012c5568c59aec7dc9825bee28902ce3431
tree00d75f1e869bf7b021643386b7bd6b52ae86d871
parentc35661261264f9307a04c2ec241e30977eb095ea
parent302b53562d63d844b5b7d6fb2cb89709eacdf9af
Merge branch 'master' into 2019-design
resources/assets/js/components/index.js
resources/assets/js/components/page-display.js