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
..
dialogs.jinja2	Proper uploading incl. drag-n-drop for both local storage and SD card	2013-05-20 23:31:17 +02:00
index.jinja2	Merge branch 'devel' into sdcard	2013-05-23 22:53:34 +02:00
settings.jinja2	Merge branch 'devel' into sdcard	2013-05-23 22:53:34 +02:00