Gina Häußge 910d965ede Merge branch 'fix/stripAnsiFromPipOutput' into devel ... Conflicts: src/octoprint/util/pip.py		2016-02-09 14:39:34 +01:00
..
octoprint	Merge branch 'fix/stripAnsiFromPipOutput' into devel	2016-02-09 14:39:34 +01:00
octoprint_client	Added octoprint client listen command and fixed socket client	2015-11-16 16:06:55 +01:00
octoprint_setuptools	Re-added dependency_links option for create_plugin_setup_parameters	2015-07-22 22:10:31 +02:00