Gina Häußge 16f5e54bd7 Merge branch 'devel' into sdcard ... Conflicts: octoprint/server.py octoprint/settings.py octoprint/static/js/ui.js octoprint/util/comm.py		2013-05-23 22:53:34 +02:00
..
css	Proper uploading incl. drag-n-drop for both local storage and SD card	2013-05-20 23:31:17 +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 sdcard	2013-05-23 22:53:34 +02:00