Gina Häußge 697affc62d Merge branch 'fix/pmgrPipWithSudo' into devel ... Conflicts: src/octoprint/plugins/pluginmanager/__init__.py src/octoprint/util/pip.py		2015-09-28 19:57:05 +02:00
..
octoprint	Merge branch 'fix/pmgrPipWithSudo' into devel	2015-09-28 19:57:05 +02:00
octoprint_setuptools	Re-added dependency_links option for create_plugin_setup_parameters	2015-07-22 22:10:31 +02:00