]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp...
authorBharadwaja G <redacted>
Tue, 29 Aug 2017 06:49:00 +0000 (12:19 +0530)
committerBharadwaja G <redacted>
Tue, 29 Aug 2017 06:49:00 +0000 (12:19 +0530)
commit6200948eec7c73108bd56b244729407d1751e816
treea3d6e1287d131dba01b975c250c1735e99825619
parent7f902e41c7a6a18a754bb889c2655aa4fba736ec
parent0a402e3c638e77c79814fc4d8e7371289e1c8900
Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master

Conflicts:
app/Http/Controllers/BookController.php
resources/lang/en/common.php
resources/views/books/create.blade.php
resources/views/books/form.blade.php
resources/views/books/index.blade.php
resources/views/users/edit.blade.php
tests/Entity/EntityTest.php
app/Http/Controllers/BookController.php
resources/assets/js/global.js
resources/assets/sass/styles.scss
resources/lang/en/common.php
resources/lang/en/settings.php
resources/views/books/create.blade.php
resources/views/books/edit.blade.php
resources/views/books/form.blade.php
resources/views/users/edit.blade.php