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 d92df9c698 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
2016-08-18 15:48:31 +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 'maintenance' into devel 2016-08-18 15:48:31 +02:00
plugin from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
plugins Merge branch 'maintenance' into devel 2016-07-28 15:00:23 +02:00
printer Merge branch 'maintenance' into devel 2016-08-16 09:34:49 +02:00
server Merge branch 'maintenance' into devel 2016-08-18 15:48:31 +02:00
slicing from __future__ import absolute_import, division, print_function 2016-07-15 00:16:58 -07:00
static Merge branch 'maintenance' into devel 2016-08-18 15:48:31 +02:00
templates Merge branch 'maintenance' into devel 2016-08-16 09:34:49 +02:00
translations/de/LC_MESSAGES Preparing release of 1.2.14 2016-07-28 12:15:22 +02:00
util Merge branch 'maintenance' into devel 2016-08-16 09:34:49 +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 Fix an issue with global_get from 3rd party plugins 2016-08-17 14:50:53 +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/python3E' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3E 2016-07-15 12:32:24 +02:00