Gina Häußge fcbd5ba042 Merge branch 'devel' into repetier ... Conflicts: octoprint/settings.py		2013-08-27 22:14:09 +02:00
..
dialogs.jinja2	Disable drop area if not a logged in user	2013-08-27 21:40:20 +02:00
index.jinja2	Implemented configurable terminal filters	2013-08-27 21:31:12 +02:00
settings.jinja2	Merge branch 'devel' into repetier	2013-08-27 22:14:09 +02:00