Teja 8d5cc52ee5 Merge branch 'mrbeam' into update_merge ... Conflicts: src/octoprint/plugins/cura/__init__.py src/octoprint/plugins/cura/profile.py src/octoprint/printer/__init__.py src/octoprint/server/__init__.py src/octoprint/server/api/printer.py src/octoprint/server/api/settings.py src/octoprint/static/js/app/main.js src/octoprint/static/js/app/viewmodels/control.js src/octoprint/static/js/app/viewmodels/settings.js		2015-01-22 17:51:28 +01:00
..
__init__.py	Merge branch 'mrbeam' into update_merge	2015-01-22 17:51:28 +01:00
analysis.py	Removed a left-over from print time estimation experiments that got overlooked	2014-12-15 11:38:17 +01:00
destinations.py	Added two file headers	2014-08-12 15:35:56 +02:00
storage.py	More error resilient handling of .metadata.yaml writes in local storage	2014-12-20 01:06:40 +01:00