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
..
util	Merge branch 'master' into devel	2013-11-20 21:57:20 +01:00
server.py	Changed SD filename generation, made SD handling more reliable as a whole	2013-09-23 17:59:22 +02:00