Gina Häußge 7232df686a Merge branch 'fix/compatibilityCheck' into devel ... Conflicts: src/octoprint/plugins/pluginmanager/__init__.py		2015-12-14 14:24:30 +01:00
..
octoprint	Merge branch 'fix/compatibilityCheck' into devel	2015-12-14 14:24:30 +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