Gina Häußge 795c2c87f5 Merge branch 'maintenance' into devel ... Conflicts: .versioneer-lookup CHANGELOG.md src/octoprint/plugins/pluginmanager/__init__.py src/octoprint/util/__init__.py		2015-07-23 12:22:02 +02:00
..
static	Revert "Remove dependency_links support again"	2015-07-22 19:06:39 +02:00
templates	Revert "Remove dependency_links support again"	2015-07-22 19:06:39 +02:00
__init__.py	Merge branch 'maintenance' into devel	2015-07-23 12:22:02 +02:00