31045b4c25
Conflicts: octoprint/timelapse.py |
||
---|---|---|
.. | ||
bootstrap-modal.css | ||
bootstrap-responsive.css | ||
bootstrap-responsive.min.css | ||
bootstrap.css | ||
bootstrap.min.css | ||
font-awesome.min.css | ||
jquery.fileupload-ui.css | ||
jquery.pnotify.default.css | ||
octoprint.less |