Gina Häußge efca776102 Merge branch 'maintenance' into devel ... Conflicts: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 src/octoprint/plugins/softwareupdate/updaters/update_script.py		2016-08-26 14:24:13 +02:00
..
css	Merge branch 'fix/includeReleasenotesInUpdateNotifications' into devel	2015-12-10 14:45:39 +01:00
js	Merge branch 'maintenance' into devel	2016-08-26 14:24:13 +02:00
less	Merge branch 'fix/includeReleasenotesInUpdateNotifications' into devel	2015-12-10 14:45:39 +01:00