Skip to content

Commit 2e4d1aa

Browse files
authored
Merge branch 'develop' into feature/issue-1450
2 parents 789d830 + 90f7ecf commit 2e4d1aa

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
99
* Fixes the `store()` function on the locations API not working due to an incorrect return typehint.
1010
* Fixes daemon secrets not being able to be reset on a Node.
1111
* Fixes an issue where files were not editable due to missing URL encoding in the file manager.
12+
* Fixed checking of language changes
13+
* Fixed Spigot egg not building versions other than `latest`.
14+
* Fixed the Forge egg install script.
1215

1316
### Updated
1417
* Upgraded core to use Laravel `5.7.14`.

app/Http/Controllers/Api/Application/Locations/LocationController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
1414
use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationRequest;
1515
use Pterodactyl\Http\Requests\Api\Application\Locations\GetLocationsRequest;
16-
use Pterodactyl\Http\Requests\Api\Application\Locations\DeleteLocationRequest;
1716
use Pterodactyl\Http\Requests\Api\Application\Locations\StoreLocationRequest;
17+
use Pterodactyl\Http\Requests\Api\Application\Locations\DeleteLocationRequest;
1818
use Pterodactyl\Http\Requests\Api\Application\Locations\UpdateLocationRequest;
1919

2020
class LocationController extends ApplicationApiController

0 commit comments

Comments
 (0)