Gina Häußge dcd67e7645 Merge branch 'fix/includeReleasenotesInUpdateNotifications' into devel ... Conflicts: src/octoprint/plugins/softwareupdate/static/css/softwareupdate.css src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js src/octoprint/plugins/softwareupdate/static/less/softwareupdate.less src/octoprint/static/css/octoprint.css src/octoprint/static/less/octoprint.less		2015-12-10 14:45:39 +01:00
..
softwareupdate.jinja2	Include release notes in update notification	2015-12-10 14:41:46 +01:00
softwareupdate_settings.jinja2	Merge branch 'fix/includeReleasenotesInUpdateNotifications' into devel	2015-12-10 14:45:39 +01:00