Gina Häußge 650e1971d4 Merge branch 'maintenance' into devel ... # Conflicts: # CHANGELOG.md # src/octoprint/static/js/app/viewmodels/usersettings.js		2016-09-16 14:11:43 +02:00
..
octoprint	Merge branch 'maintenance' into devel	2016-09-16 14:11:43 +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