Merge remote-tracking branch 'origin/devel'

This commit is contained in:
BrokenFire 2017-07-25 22:38:17 +02:00
commit 7326632e28
2 changed files with 5 additions and 1 deletions

View File

@ -14,3 +14,7 @@ or manually using this URL:
- **emergencyGcode**
Diffine the GCODE to send when the button is pressed.
## API
Adding `plugin/simpleemergencystop` route, commande is `emergencyStop`.

View File

@ -1,3 +1,4 @@
<h3>{{_("Simple Emergency Stop")}}</h3>
<form class="form-horizontal">
<div class="control-group">
<label class="control-label">{{ _('Emergency GCODE:') }}</label>
@ -6,4 +7,3 @@
</div>
</div>
</form>