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

This commit is contained in:
Dane Everitt 2017-09-22 00:30:11 -05:00
commit 68cc71ecfe
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
14 changed files with 72 additions and 53 deletions

View file

@ -41,5 +41,6 @@ return [
'server_reinstalled' => 'This server has been queued for a reinstallation beginning now.',
'details_updated' => 'Server details have been successfully updated.',
'docker_image_updated' => 'Successfully changed the default Docker image to use for this server. A reboot is required to apply this change.',
'node_required' => 'You must have at least one node configured before you can add a server to this panel.',
],
];

View file

@ -3,7 +3,7 @@
return [
'not_authorized' => 'You are not authorized to perform this action.',
'auth_error' => 'There was an error while attempting to login.',
'authentication_required' => 'Authentication is required in order to continue.',
'authentication_required' => 'Authentication is required to continue.',
'remember_me' => 'Remember Me',
'sign_in' => 'Sign In',
'forgot_password' => 'I\'ve forgotten my password!',