pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
MrDraw/src/octoprint
History
Gina Häußge 47b7acdfbc Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 
Conflicts:
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/printer/standard.py
2016-07-15 12:28:19 +02:00
..
cli Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
filemanager Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
plugin from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
plugins Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
printer Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
server Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
slicing from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
static Fix highlighting of selected file in file list in frontend 2016-07-08 11:14:40 +02:00
templates Have frontend's printer state also track file path 2016-07-08 11:13:14 +02:00
translations/de/LC_MESSAGES Preparing release of 1.2.12 2016-06-08 13:09:04 +02:00
util Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
__init__.py Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
_version.py from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
daemon.py Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
events.py Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
settings.py Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
timelapse.py Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 2016-07-15 12:28:19 +02:00
users.py Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00