]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into 2019-design
authorDan Brown <redacted>
Sun, 13 Jan 2019 14:10:27 +0000 (14:10 +0000)
committerDan Brown <redacted>
Sun, 13 Jan 2019 14:10:27 +0000 (14:10 +0000)
commit163a57cf7080738accb8a25232125b1f1d659035
treec1ac4415feb83aab595dd42fbb4d932e6f8108fc
parent7f95b51b00d0d5fa1e7bcf5574f2d58bddcbd504
parenta3ccde869881ce84dcee35ebc6644933675a581c
Merge branch 'master' into 2019-design
app/Entities/Repos/EntityRepo.php
app/Http/Controllers/UserController.php
resources/lang/en/common.php
resources/views/common/header.blade.php
resources/views/pages/show.blade.php