Gina Häußge 7791f7751f Merge branch 'fix/aclFirstRun' into devel ... Conflicts: src/octoprint/server/__init__.py src/octoprint/server/api/__init__.py src/octoprint/server/views.py src/octoprint/static/js/app/dataupdater.js src/octoprint/static/js/app/viewmodels/firstrun.js		2015-12-17 13:16:51 +01:00
..
corewizard	Merge branch 'fix/aclFirstRun' into devel	2015-12-17 13:16:51 +01:00
cura	Merge branch 'maintenance' into devel	2015-11-19 11:51:16 +01:00
discovery	Finalizing first version of plugin lifecycle management	2015-04-14 17:55:46 +02:00
pluginmanager	Merge branch 'fix/compatibilityCheck' into devel	2015-12-14 14:24:30 +01:00
softwareupdate	Merge branch 'maintenance' into devel	2015-12-14 11:58:21 +01:00
virtual_printer	Added feature flag to toggle F command support	2015-12-17 10:37:32 +01:00