Merge branch 'maintenance' into devel

Browse source

Conflicts:
	AUTHORS.md
	src/octoprint/daemon.py
	src/octoprint/server/__init__.py

...

This commit is contained in:

Gina Häußge 2016-05-12 11:01:36 +02:00

parent 425fa8e639 2c0fa7c1d1

commit 2074aae940

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available