Merge branch 'richardjm-devel' into devel

Browse Source

Conflicts:
	octoprint/static/css/ui.css
	octoprint/templates/index.html

master

Gina Häußge 2013-03-07 22:20:45 +01:00

parent 6eb8991035 f68b0ddc04

commit 72c0e703b9

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 Not Available