Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Console/Commands/RestoreFromBackup.php

@@ -249,6 +249,7 @@ public function handle()
             'storage/private_uploads/consumables',
             'storage/private_uploads/eula-pdfs',
             'storage/private_uploads/imports',
+            'storage/private_uploads/locations',
             'storage/private_uploads/licenses',
             'storage/private_uploads/signatures',
             'storage/private_uploads/users',