Gina Häußge 47b7acdfbc Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A ... Conflicts: src/octoprint/plugins/virtual_printer/virtual.py src/octoprint/printer/standard.py		2016-07-15 12:28:19 +02:00
..
octoprint	Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A	2016-07-15 12:28:19 +02:00
octoprint_client	from __future__ import absolute_import, division, print_function	2016-07-15 00:16:58 -07:00
octoprint_setuptools	from __future__ import absolute_import, division, print_function	2016-07-15 00:16:58 -07:00