pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev/folderSupport' of github.com:foosel/OctoPrint into dev/folderSupport

Browse source 
Conflicts:
	src/octoprint/static/js/app/client/files.js
This commit is contained in:
Salandora 2015-10-09 19:54:51 +02:00
commit ca0463b4c0
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/octoprint/static/js/app/client/files.js
View file

@ -90,6 +90,7 @@
}
return OctoPrint.post(resourceForLocation(location), data);
},
upload: function (location, file, data) {