Philipp Engel c60c05972c Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam ... Conflicts: src/octoprint/templates/index.jinja2		2014-11-24 20:04:56 +01:00
..
octoprint	Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam	2014-11-24 20:04:56 +01:00