Merge branch 'develop' into pr/1129

This commit is contained in:
Dane Everitt
2018-05-26 10:34:29 -07:00
174 changed files with 1485 additions and 1116 deletions

View File

@@ -76,7 +76,7 @@
<h3 class="box-title">Delete Node</h3>
</div>
<div class="box-body">
<p class="no-margin">Deleting a node is a irreversable action and will immediately remove this node from the panel. There must be no servers associated with this node in order to continue.</p>
<p class="no-margin">Deleting a node is a irreversible action and will immediately remove this node from the panel. There must be no servers associated with this node in order to continue.</p>
</div>
<div class="box-footer">
<form action="{{ route('admin.nodes.view.delete', $node->id) }}" method="POST">