Merge pull request #2283 from BookStackApp/recycle_bin

author Dan Brown <redacted>

Sat, 7 Nov 2020 15:10:17 +0000 (15:10 +0000)

committer GitHub <redacted>

Sat, 7 Nov 2020 15:10:17 +0000 (15:10 +0000)
author Dan Brown <redacted>
Sat, 7 Nov 2020 15:10:17 +0000 (15:10 +0000)
committer GitHub <redacted>
Sat, 7 Nov 2020 15:10:17 +0000 (15:10 +0000)
diff --cc .env.example.complete
Simple merge
diff --cc app/Auth/Permissions/PermissionService.php
Simple merge
diff --cc tests/Uploads/AttachmentTest.php
Simple merge
		1	2
.env.example.complete	patch \|	diff1 \|	diff2 \|	blob \| history
app/Auth/Permissions/PermissionService.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Uploads/AttachmentTest.php	patch \|	diff1 \|	diff2 \|	blob \| history