Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

This commit is contained in:
Dane Everitt 2017-09-04 14:34:40 -05:00
commit 7222754580
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
12 changed files with 59 additions and 59 deletions

View file

@ -24,13 +24,13 @@
namespace Pterodactyl\Http\Controllers\Server\Files;
use GuzzleHttp\Exception\RequestException;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
use Illuminate\Contracts\Session\Session;
use Illuminate\Http\Request;
use Illuminate\Log\Writer;
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
use Illuminate\Http\Request;
use Illuminate\Contracts\Session\Session;
use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
class RemoteRequestController extends Controller
{