Gina Häußge 7a69096a83 Merge branch 'gcodeVisualizerFileSizeThreshold' of https://github.com/philphilphil/OctoPrint into pr/philphilphil/gcodeVisualizerFileSizeThreshold ... Conflicts: src/octoprint/settings.py		2016-05-09 12:47:06 +02:00
..
bindings	Merge branch 'fix/terminalLoad' into devel	2016-01-27 12:37:03 +01:00
client	Fixed a bunch of issues with the software update wizard	2016-03-30 15:45:13 +02:00
viewmodels	Merge branch 'gcodeVisualizerFileSizeThreshold' of https://github.com/philphilphil/OctoPrint into pr/philphilphil/gcodeVisualizerFileSizeThreshold	2016-05-09 12:47:06 +02:00
dataupdater.js	Merge branch 'maintenance' into devel	2016-03-16 11:24:52 +01:00
helpers.js	Support Fahrenheit display.	2016-03-24 20:46:42 -04:00
main.js	Added adaptive rate limiting to client	2016-01-27 12:04:17 +01:00