Gina Häußge 9de78001dd Merge branch 'maintenance' into devel ... # Conflicts: # CHANGELOG.md # docs/plugins/concepts.rst # src/octoprint/__init__.py # src/octoprint/server/__init__.py # src/octoprint/templates/javascripts.jinja2 # src/octoprint/timelapse.py Merge branch 'devel' into dev/wizard # Conflicts: # octoprint_octobullet/__init__.py # octoprint_octobullet/templates/octobullet_settings.jinja2 Merge branch 'devel' into dev/wizard # Conflicts: # octoprint_octobullet/__init__.py # octoprint_octobullet/templates/octobullet_settings.jinja2		2016-10-13 14:22:40 +02:00
..
octoprint	Merge branch 'maintenance' into devel	2016-10-13 14:22:40 +02:00
octoprint_client	from __future__ import absolute_import, division, print_function	2016-07-15 00:16:58 -07:00
octoprint_setuptools	from __future__ import absolute_import, division, print_function	2016-07-15 00:16:58 -07:00