Gina Häußge ea52bbfb14 Merge branch 'gcodeViewer' into devel ... Conflicts: octoprint/server.py octoprint/settings.py octoprint/static/js/ui.js		2013-02-03 21:38:00 +01:00
..
index.html	Merge branch 'gcodeViewer' into devel	2013-02-03 21:38:00 +01:00