q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
OctoPrint/octoprint/templates
History
Gina Häußge 8be1329a71 Merge branch 'devel' into gcodestreaming 
Conflicts:
	octoprint/printer.py
	octoprint/static/js/ui.js
	octoprint/templates/index.jinja2
	octoprint/util/comm.py
 		2013-06-09 18:28:40 +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 gcodestreaming 2013-06-09 18:28:40 +02:00
settings.jinja2 Added SD state evaluation and SD commands 2013-05-26 18:53:43 +02:00