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

resources/lang/en/base.php

@@ -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' => [

resources/lang/en/strings.php

@@ -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',

resources/themes/pterodactyl/admin/servers/view/build.blade.php

@@ -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>