Gina Häußge e5217813bd Merge branch 'fix/sdcardTimelapseWarning' into devel ... Conflicts: src/octoprint/server/views.py src/octoprint/templates/initscript.jinja2		2015-10-08 10:25:18 +02:00
..
octoprint	Merge branch 'fix/sdcardTimelapseWarning' into devel	2015-10-08 10:25:18 +02:00
octoprint_setuptools	Re-added dependency_links option for create_plugin_setup_parameters	2015-07-22 22:10:31 +02:00