StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/1129

Browse source
This commit is contained in:
Dane Everitt 2018-05-26 10:34:29 -07:00
commit e3bbd85f3f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
174 changed files with 1485 additions and 1116 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/themes/pterodactyl/base/account.blade.php
View file

@ -64,7 +64,7 @@
<div class="box box-primary">
<form action="{{ route('account') }}" method="POST">
<div class="box-header with-border">
<h3 class="box-title">@lang('base.account.update_identitity')</h3>
<h3 class="box-title">@lang('base.account.update_identity')</h3>
</div>
<div class="box-body">
<div class="row">
@ -94,7 +94,7 @@
<div class="box-footer with-border">
{!! csrf_field() !!}
<input type="hidden" name="do_action" value="identity" />
<button type="submit" class="btn btn-sm btn-primary">@lang('base.account.update_identitity')</button>
<button type="submit" class="btn btn-sm btn-primary">@lang('base.account.update_identity')</button>
</div>
</form>
</div>

2
resources/themes/pterodactyl/base/api/index.blade.php
View file

@ -113,7 +113,7 @@
swal({
type: 'error',
title: 'Whoops!',
text: 'An error occured while attempting to revoke this key.'
text: 'An error occurred while attempting to revoke this key.'
});
});
});