Gina Häußge e96765bc39 Merge branch 'master' into devel ... Conflicts: octoprint/static/css/octoprint.less		2013-06-17 22:12:45 +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 'master' into devel	2013-06-17 22:12:45 +02:00
settings.jinja2	Added SD state evaluation and SD commands	2013-05-26 18:53:43 +02:00