Merge branch 'fix/temperatureYaxisCutoff' into devel
Conflicts: AUTHORS.md
This commit is contained in:
commit
1728e579b1
2 changed files with 2 additions and 1 deletions
|
|
@ -55,6 +55,7 @@ date of first contribution):
|
|||
* [Thomas Hou](https://github.com/masterhou)
|
||||
* [Mark Bastiaans](https://github.com/markbastiaans)
|
||||
* [Marcel Hellwig](https://github.com/punkkeks)
|
||||
* [Kevin Murphy](https://github.com/kevingelion)
|
||||
|
||||
OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by
|
||||
[Daid Braam](https://github.com/daid). Parts of its communication layer and
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{% if enableTemperatureGraph %}
|
||||
<div class="row" style="padding-left: 20px">
|
||||
<div class="row-fluid">
|
||||
<div id="temperature-graph"></div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
Loading…
Reference in a new issue