Merge remote-tracking branch 'origin/devel' into devel

This commit is contained in:
Gina Häußge 2016-10-04 18:40:34 +02:00
commit c5259338dc

View file

@ -73,6 +73,7 @@ date of first contribution):
* [Eyck Jentzsch](https://github.com/eyck)
* [Mathias Rangel Wulff](https://github.com/mathiasrw)
* [Clemens Niemeyer](https://github.com/clemniem)
* ["I-am-me"](https://github.com/I-am-me)
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