Gina Häußge fcbd5ba042 Merge branch 'devel' into repetier ... Conflicts: octoprint/settings.py		2013-08-27 22:14:09 +02:00
..
css	Added left space on filesystem holding the uploads folder to the gcode files list	2013-07-20 16:01:17 +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 'devel' into repetier	2013-08-27 22:14:09 +02:00
robots.txt	And a robots.txt for good measure...	2013-08-11 16:57:39 +02:00