]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into bug/image-upload 754/head
authorAbijeet Patro <redacted>
Sun, 18 Mar 2018 18:14:33 +0000 (23:44 +0530)
committerGitHub <redacted>
Sun, 18 Mar 2018 18:14:33 +0000 (23:44 +0530)
commit0335f584783ee5a892aba751e27ce95e7b9921c3
tree579ff7ff4f6c07f1765cfbb82b4161eb1602559e
parent3a5c20c17e4228ad37a35e7267ab890c7ae92bcb
parent380e2ff668c9dfb3a4eee289003401ef73082e65
Merge branch 'master' into bug/image-upload
app/Http/Controllers/ImageController.php
resources/assets/sass/_components.scss
resources/assets/sass/_pages.scss