Gina Häußge de78c14ae3 Merge branch 'maintenance' into devel ... Conflicts: CHANGELOG.md src/octoprint/static/js/app/dataupdater.js src/octoprint/static/js/app/main.js src/octoprint/static/js/app/viewmodels/files.js src/octoprint/static/js/app/viewmodels/loginstate.js		2016-06-09 12:56:07 +02:00
..
index.rst	Merge branch 'maintenance' into devel	2016-06-09 12:56:07 +02:00