Merge branch 'master' into toMerge

Browse source

Conflicts:
	octoprint/server.py
	setup.py
	src/octoprint/printer.py
	src/octoprint/static/js/app/main.js
	src/octoprint/util/__init__.py

...

This commit is contained in:

Gina Häußge 2013-12-21 15:55:41 +01:00

parent 64084bb628 2f3c3c0c20

commit 765b941472

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