e96765bc39
Conflicts: octoprint/static/css/octoprint.less |
||
---|---|---|
.. | ||
apple-touch-icon-114x114.png | ||
apple-touch-icon-144x144.png | ||
glyphicons-halflings-white.png | ||
glyphicons-halflings.png | ||
graph-background.png | ||
icon-sd-black-14.png | ||
logo.png | ||
tentacle-20x20-light.png | ||
tentacle-20x20-light@2x.png | ||
tentacle-20x20.png | ||
tentacle-20x20@2x.png | ||
tentacle-22x22.png | ||
tentacle-32x32.png | ||
tentacle-76x76.png | ||
watermark.png |