Gina Häußge b07c352b48 Merge branch 'improve/slicingFlexibility' into devel ... Conflicts: src/octoprint/filemanager/__init__.py src/octoprint/server/api/files.py src/octoprint/static/js/app/viewmodels/slicing.js		2016-07-04 10:24:43 +02:00
..
announcements	Preparing release of 1.2.12 (part three)	2016-06-09 09:31:36 +02:00
corewizard	Added wizard for setup of server commands	2016-03-30 11:28:40 +02:00
cura	Merge branch 'improve/slicingFlexibility' into devel	2016-07-04 10:24:43 +02:00
discovery	Finalizing first version of plugin lifecycle management	2015-04-14 17:55:46 +02:00
pluginmanager	Merge branch 'maintenance' into devel	2016-05-09 10:29:20 +02:00
softwareupdate	Merge branch 'maintenance' into devel	2016-05-03 10:48:26 +02:00
virtual_printer	Merge branch 'maintenance' into devel	2016-06-21 16:10:02 +02:00