Gina Häußge 696979789e Merge branch 'improve/supportRinTempCommands' into devel ... # Conflicts: # src/octoprint/plugins/virtual_printer/virtual.py		2016-10-17 10:44:18 +02:00
..
announcements	First throw at caching of API methods	2016-08-30 19:02:30 +02:00
corewizard	Refactored printer profile editor	2016-09-21 10:11:38 +02:00
cura	Merge branch 'improve/curaImporter' into devel	2016-10-14 12:00:17 +02:00
discovery	Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B	2016-07-15 11:28:55 +02:00
pluginmanager	Merge branch 'maintenance' into devel	2016-10-13 14:22:40 +02:00
softwareupdate	Docs for CLI of software update plugin	2016-10-14 13:57:01 +02:00
virtual_printer	Merge branch 'improve/supportRinTempCommands' into devel	2016-10-17 10:44:18 +02:00