pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
MrDraw/src/octoprint/plugins/virtual_printer
History
Gina Häußge 54fe75fb4e Merge branch 'improve/aboutDialog' into devel 
Conflicts:
	.gitignore
	THIRDPARTYLICENSES.md
	setup.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/__init__.py
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
	src/octoprint/templates/dialogs/about/about.jinja2
	src/octoprint/templates/index.jinja2
2016-04-21 12:10:03 +02:00
..
__init__.py Fixed some wrong indentation that somehow made it through editorconfig 2015-09-11 11:48:38 +02:00
virtual.py Merge branch 'improve/aboutDialog' into devel 2016-04-21 12:10:03 +02:00