Gina Häußge c6e15a7d32 Merge branch 'richardjm-devel' into devel ... Conflicts: octoprint/server.py octoprint/settings.py octoprint/templates/index.jinja2		2013-06-23 16:09:31 +02:00
..
css	Merge branch 'peteruithoven-master' into devel	2013-06-23 14:58:58 +02:00
font	Forgot to commit Font Awesome	2013-03-30 18:29:13 +01:00
gcodeviewer	Made gcode viewer capable of handling progress information	2013-06-09 14:00:15 +02:00
img	Merge branch 'master' into devel	2013-06-17 22:12:45 +02:00
js	Merge branch 'richardjm-devel' into devel	2013-06-23 16:09:31 +02:00