Gina Häußge fcbd5ba042 Merge branch 'devel' into repetier ... Conflicts: octoprint/settings.py		2013-08-27 22:14:09 +02:00
..
app	Merge branch 'devel' into repetier	2013-08-27 22:14:09 +02:00
lib	Replaced socket.io with SockJS	2013-08-26 17:37:13 +02:00