Teja d55e723f75 Merge remote-tracking branch 'upstream/devel' into update_merge ... Conflicts: src/octoprint/plugins/cura/profile.py src/octoprint/plugins/cura/static/js/cura.js src/octoprint/plugins/svgtogcode/__init__.py src/octoprint/plugins/svgtogcode/templates/svgtogcode_settings_dialog.jinja2 src/octoprint/server/__init__.py src/octoprint/server/api/settings.py src/octoprint/settings.py src/octoprint/static/js/app/main.js src/octoprint/static/js/app/viewmodels/control.js src/octoprint/static/js/app/viewmodels/settings.js src/octoprint/templates/dialogs.jinja2 src/octoprint/templates/index.jinja2		2015-01-23 11:37:47 +01:00
..
bootstrap	beamification of the octoprint ui.	2014-11-22 19:03:23 +01:00
font-awesome.less	Upgraded Font Awesome and introduced new file list	2014-04-28 22:11:56 +02:00
octoprint.less	More work on the template refactoring and new template plugin types	2015-01-15 11:06:59 +01:00
variables.less	Lots of changes:	2014-01-05 11:23:44 +01:00