Skip to content

Commit c1a7e4e

Browse files
committed
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2 parents 9ba6aae + 323c3e4 commit c1a7e4e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/Http/Controllers/Api/Client/AccountController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function updatePassword(UpdatePasswordRequest $request): \Illuminate\Http
7878
{
7979
$this->updateService->handle($request->user(), $request->validated());
8080

81-
$this->sessionGuard->logoutOtherDevices($request->input('current_password'));
81+
$this->sessionGuard->logoutOtherDevices($request->input('password'));
8282

8383
return JsonResponse::create([], Response::HTTP_NO_CONTENT);
8484
}

resources/scripts/TransitionRouter.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default ({ children }: Props) => (
2828
</ContentContainer>
2929
<ContentContainer className={'mb-4'}>
3030
<p className={'text-right text-neutral-500 text-xs'}>
31-
&copy; 2015 - 2019&nbsp;
31+
&copy; 2015 - 2020&nbsp;
3232
<a
3333
rel={'noopener nofollow'}
3434
href={'https://pterodactyl.io'}

0 commit comments

Comments
 (0)