Gina Häußge 2971c29f10 Merge branch 'improve/pauseApiCommand' into devel ... Conflicts: src/octoprint/static/js/app/viewmodels/printerstate.js		2016-06-30 13:01:13 +02:00
..
octoprint	Merge branch 'improve/pauseApiCommand' into devel	2016-06-30 13:01:13 +02:00
octoprint_client	Added octoprint client listen command and fixed socket client	2015-11-16 16:06:55 +01:00
octoprint_setuptools	Use print_function import + added @MirceDan to AUTHORS.md	2016-06-15 10:52:49 +02:00