Gina Häußge 0199599880 Merge branch 'master' into devel ... Conflicts: octoprint/server.py octoprint/util/__init__.py setup.py src/octoprint/printer.py src/octoprint/static/js/app/main.js src/octoprint/templates/index.jinja2		2013-11-20 21:57:20 +01:00
..
__init__.py	Properly calculate time deltas (forgot the days)	2013-11-20 20:22:03 +01:00