Gina Häußge d721e5edc2 Merge branch 'devel' into repetier ... Conflicts: octoprint/util/comm.py		2013-04-16 15:14:18 +02:00
..
css	Added missing files	2013-04-14 13:15:54 +02:00
font	Forgot to commit Font Awesome	2013-03-30 18:29:13 +01:00
gcodeviewer	Fixed Modernizr queries by gcode renderer	2013-04-14 13:42:30 +02:00
img	Added (optional!) watermark addition to generated timelapse movies.	2013-03-09 00:23:52 +01:00
js	Merge branch 'devel' into repetier	2013-04-16 15:14:18 +02:00