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

Browse source

Conflicts:
	src/octoprint/util/comm_acc2.py

...

This commit is contained in:

make-ing 2016-01-15 16:43:22 +01:00

parent de622e5e8e bead551353

commit a5330313a4

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