221ea637be
Conflicts: src/octoprint/printer/__init__.py src/octoprint/server/__init__.py src/octoprint/settings.py src/octoprint/static/css/octoprint.css src/octoprint/static/js/app/main.js src/octoprint/static/js/i18n/de.js src/octoprint/static/js/i18n/fr.js src/octoprint/static/js/i18n/he.js src/octoprint/static/js/i18n/nl.js src/octoprint/static/js/i18n/no.js src/octoprint/static/js/i18n/ro.js src/octoprint/templates/index.jinja2 src/octoprint/templates/settings.jinja2 src/octoprint/translations/de/LC_MESSAGES/messages.mo src/octoprint/translations/de/LC_MESSAGES/messages.po src/octoprint/translations/fr/LC_MESSAGES/messages.mo src/octoprint/translations/fr/LC_MESSAGES/messages.po src/octoprint/translations/he/LC_MESSAGES/messages.mo src/octoprint/translations/he/LC_MESSAGES/messages.po src/octoprint/translations/messages.pot src/octoprint/translations/nl/LC_MESSAGES/messages.mo src/octoprint/translations/nl/LC_MESSAGES/messages.po src/octoprint/translations/no/LC_MESSAGES/messages.mo src/octoprint/translations/no/LC_MESSAGES/messages.po src/octoprint/translations/ro/LC_MESSAGES/messages.mo src/octoprint/translations/ro/LC_MESSAGES/messages.po src/octoprint/util/comm.py
15 lines
188 B
Text
15 lines
188 B
Text
flask==0.9
|
|
werkzeug==0.8.3
|
|
tornado==4.0.2
|
|
sockjs-tornado>=1.0.0
|
|
PyYAML==3.10
|
|
Flask-Login==0.2.2
|
|
Flask-Principal==0.3.5
|
|
Flask-Babel==0.9
|
|
pyserial
|
|
netaddr
|
|
watchdog
|
|
sarge
|
|
netifaces
|
|
pylru
|
|
rsa
|