pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
MrDraw/src/octoprint/plugins
History
Gina Häußge aae01fe81b Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	docs/api/fileops.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/api/files.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/sidebar/state.jinja2
	src/octoprint/util/comm.py
2016-07-28 15:00:23 +02:00
..
announcements from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
corewizard from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
cura Explicitly use floor division where necessary 2016-07-15 11:42:01 +02:00
discovery Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
pluginmanager from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
softwareupdate Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
virtual_printer Merge branch 'maintenance' into devel 2016-07-28 15:00:23 +02:00