Merge branch 'develop' into develop

This commit is contained in:
Caleb 2020-10-13 15:35:38 -04:00 committed by GitHub
commit ea778e9345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
159 changed files with 3400 additions and 3896 deletions

View file

@ -38,7 +38,7 @@
<p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
</div>
<div class="form-group">
<label for="threads" class="control-label">CPU Threads</label>
<label for="threads" class="control-label">CPU Pinning</label>
<div>
<input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
</div>