Gina Häußge c6e15a7d32 Merge branch 'richardjm-devel' into devel ... Conflicts: octoprint/server.py octoprint/settings.py octoprint/templates/index.jinja2		2013-06-23 16:09:31 +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 'richardjm-devel' into devel	2013-06-23 16:09:31 +02:00
settings.jinja2	Merge branch 'richardjm-devel' into devel	2013-06-23 16:09:31 +02:00