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
..
scripts	Fixed a merge error, _execute returns three values in 1.3.0, not two	2016-09-01 10:29:29 +02:00
static	First throw at caching of API methods	2016-08-30 19:02:30 +02:00
templates	Merge branch 'maintenance' into devel	2016-09-09 12:31:29 +02:00
updaters	Merge branch 'maintenance' into devel	2016-10-13 14:22:40 +02:00
version_checks	Merge branch 'maintenance' into devel	2016-08-26 14:24:13 +02:00
__init__.py	Merge branch 'maintenance' into devel	2016-09-23 14:35:31 +02:00
cli.py	from __future__ import absolute_import, division, print_function	2016-07-15 00:16:58 -07:00
exceptions.py	from __future__ import absolute_import, division, print_function	2016-07-15 00:16:58 -07:00
util.py	from __future__ import absolute_import, division, print_function	2016-07-15 00:16:58 -07:00