Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dane Everitt 2020-04-09 22:08:16 -07:00
commit c1a7e4ebe1
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/Client/AccountController.php
View file

@ -78,7 +78,7 @@ class AccountController extends ClientApiController
{ {
$this->updateService->handle($request->user(), $request->validated()); $this->updateService->handle($request->user(), $request->validated());
$this->sessionGuard->logoutOtherDevices($request->input('current_password')); $this->sessionGuard->logoutOtherDevices($request->input('password'));
return JsonResponse::create([], Response::HTTP_NO_CONTENT); return JsonResponse::create([], Response::HTTP_NO_CONTENT);
} }

2
resources/scripts/TransitionRouter.tsx
View file

@ -28,7 +28,7 @@ export default ({ children }: Props) => (
</ContentContainer> </ContentContainer>
<ContentContainer className={'mb-4'}> <ContentContainer className={'mb-4'}>
<p className={'text-right text-neutral-500 text-xs'}> <p className={'text-right text-neutral-500 text-xs'}>
&copy; 2015 - 2019&nbsp; &copy; 2015 - 2020&nbsp;
<a <a
rel={'noopener nofollow'} rel={'noopener nofollow'}
href={'https://pterodactyl.io'} href={'https://pterodactyl.io'}