Gina Häußge 8875f257ea Merge branch 'devel' into dev/clientlib ... Conflicts: src/octoprint/server/api/__init__.py src/octoprint/static/js/app/viewmodels/navigation.js		2015-10-01 14:22:15 +02:00
..
static	Merge branch 'devel' into dev/clientlib	2015-10-01 14:22:15 +02:00
templates	PMGR: Better wording of "pip unavailable" message	2015-09-30 15:59:08 +02:00
__init__.py	PMGR: only mark as pending (un)installed if restart is needed	2015-09-30 14:30:10 +02:00