MrDraw/tests
Gina Häußge b6fbbb353a Merge branch 'maintenance' into devel
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/filemanager/storage.py
#	src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
2016-09-09 12:31:29 +02:00
..
filemanager Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
plugin Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
printer Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
server Only use non-postfixed cookie if no postfixed one exists 2016-09-08 15:42:51 +02:00
settings python 3 changes exceptions, queue and asesrtEqual 2016-07-14 23:53:39 -07:00
slicing Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
static/js QUnit tests for some javascript helpers 2015-08-27 10:29:31 +02:00
timelapse More timelapse unit tests 2016-02-10 16:44:46 +01:00
users Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
util Fix some more left-overs of py2<->py3 PRs 2016-07-15 12:46:53 +02:00
test_daemon.py Fix some more left-overs of py2<->py3 PRs 2016-07-15 12:46:53 +02:00