]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into add_role_view_permissions
authorDan Brown <redacted>
Wed, 20 Apr 2016 19:22:30 +0000 (20:22 +0100)
committerDan Brown <redacted>
Wed, 20 Apr 2016 19:22:30 +0000 (20:22 +0100)
commit043cdeafb3773288fd7d07ac3dbdbf989ef94bb8
tree2f9269bd2f8d6660e43c970d8b75ebc676c06c5f
parent6e03078de3860cc82e30b14ebbcd192a797fd75f
parent8b36ca95a398a3d8c946c8571f81f62982e32d6b
Merge branch 'master' into add_role_view_permissions
app/Http/Controllers/BookController.php
app/Http/Controllers/PageController.php
resources/views/settings/roles/form.blade.php