pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
MrDraw/src/octoprint/server
History
Gina Häußge dc874d98ac Merge branch 'dev/python3E' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3E 
Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/users.py
	src/octoprint/util/jinja.py
2016-07-15 12:32:24 +02:00
..
api Merge branch 'dev/python3E' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3E 2016-07-15 12:32:24 +02:00
apps from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
util Merge branch 'dev/python3E' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3E 2016-07-15 12:32:24 +02:00
__init__.py Merge branch 'dev/python3E' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3E 2016-07-15 12:32:24 +02:00
views.py from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00