webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-01-03 23:42:28 +03:00
Code Activity

Resolved conflicts

Browse Source
This commit is contained in:
Bharadwaja G
2017-08-24 12:21:43 +05:30
parent 3079a9f4de 28a9bd514f
commit 7f902e41c7
145 changed files with 4076 additions and 1751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/components/image-picker.blade.php
View File

@@ -43,7 +43,7 @@
}
if (action === 'show-image-manager') {
window.ImageManager.showExternal((image) => {
window.ImageManager.show((image) => {
if (!resize) {
setImage(image);
return;