Merge pull request #461 from parkervcp/develop

Feedback from discord
This commit is contained in:
Dane Everitt 2017-05-29 19:47:24 -05:00 committed by GitHub
commit 9db4fb0039
3 changed files with 3 additions and 3 deletions

View file

@ -24,7 +24,7 @@ return [
],
'index' => [
'header' => 'Your Servers',
'header_sub' => 'Servers you own and have access to.',
'header_sub' => 'Servers you have access to.',
'list' => 'Server List',
],
'api' => [

View file

@ -20,7 +20,7 @@ return [
'account' => 'Account',
'security' => 'Security',
'ip' => 'IP Address',
'last_activity' => 'Last Activitiy',
'last_activity' => 'Last Activity',
'revoke' => 'Revoke',
'2fa_token' => 'Authentication Token',
'submit' => 'Submit',

View file

@ -66,7 +66,7 @@
<input type="text" name="memory" data-multiplicator="true" class="form-control" value="{{ old('memory', $server->memory) }}"/>
<span class="input-group-addon">MB</span>
</div>
<p class="text-muted small">The maximum amount of memory allowed for this container. Setting this to <code>0</code> will allow unlimited memorry in a container.</p>
<p class="text-muted small">The maximum amount of memory allowed for this container. Setting this to <code>0</code> will allow unlimited memory in a container.</p>
</div>
<div class="form-group">
<label for="swap" class="control-label">Allocated Swap</label>