MrDraw/THIRDPARTYLICENSES.md
Gina Häußge 76b4a45495 Merge branch 'maintenance' into devel
Conflicts:
	THIRDPARTYLICENSES.md
	setup.py
	src/octoprint/server/__init__.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
	src/octoprint/static/css/octoprint.css
2016-05-03 10:48:26 +02:00

3.3 KiB

Third Party Licenses

Web Interface

Server