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
..
_plugins	Some tests for the new plugin core functionality	2015-09-04 16:43:10 +02:00
__init__.py	Updated/fixed unit tests and travis configuration	2015-03-02 12:58:24 +01:00
test_core.py	python 3 changes exceptions, queue and asesrtEqual	2016-07-14 23:53:39 -07:00
test_settings.py	Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A	2016-07-15 12:28:19 +02:00
test_types_blueprint.py	python 3 changes exceptions, queue and asesrtEqual	2016-07-14 23:53:39 -07:00
test_types_settings.py	python 3 changes exceptions, queue and asesrtEqual	2016-07-14 23:53:39 -07:00