Gina Häußge 8875f257ea Merge branch 'devel' into dev/clientlib ... Conflicts: src/octoprint/server/api/__init__.py src/octoprint/static/js/app/viewmodels/navigation.js		2015-10-01 14:22:15 +02:00
..
corewizard	Migrated existing javascript application files to use client lib	2015-09-25 13:53:42 +02:00
cura	Migrate to new utility methods for testing URLs & executable paths	2015-09-28 17:08:25 +02:00
discovery	Finalizing first version of plugin lifecycle management	2015-04-14 17:55:46 +02:00
pluginmanager	Merge branch 'devel' into dev/clientlib	2015-10-01 14:22:15 +02:00
softwareupdate	Migrated client to module factory pattern	2015-09-28 17:07:37 +02:00
virtual_printer	M400 and proper M114 in virtual printer	2015-09-21 08:41:28 +02:00