Gina Häußge e96765bc39 Merge branch 'master' into devel ... Conflicts: octoprint/static/css/octoprint.less		2013-06-17 22:12:45 +02:00
..
apple-touch-icon-114x114.png	optimize image file size on iOS web clip icons	2013-02-16 23:32:31 -06:00
apple-touch-icon-144x144.png	optimize image file size on iOS web clip icons	2013-02-16 23:32:31 -06:00
glyphicons-halflings-white.png	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
glyphicons-halflings.png	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
graph-background.png	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
icon-sd-black-14.png	Added missing image resource	2013-06-03 22:25:23 +02:00
logo.png	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
tentacle-20x20-light.png	Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings	2013-06-08 18:43:17 -05:00
tentacle-20x20-light@2x.png	Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings	2013-06-08 18:43:17 -05:00
tentacle-20x20.png	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
tentacle-20x20@2x.png	Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings	2013-06-08 18:43:17 -05:00
tentacle-22x22.png	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
tentacle-32x32.png	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
tentacle-76x76.png	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
watermark.png	Added (optional!) watermark addition to generated timelapse movies.	2013-03-09 00:23:52 +01:00