Gina Häußge fcbd5ba042 Merge branch 'devel' into repetier ... Conflicts: octoprint/settings.py		2013-08-27 22:14:09 +02:00
..
viewmodels	Merge branch 'devel' into repetier	2013-08-27 22:14:09 +02:00
dataupdater.js	Replaced socket.io with SockJS	2013-08-26 17:37:13 +02:00
helpers.js	Refactored ui.js into single files, cleaned up js folder	2013-08-11 19:15:37 +02:00
main.js	Disable drop area if not a logged in user	2013-08-27 21:40:20 +02:00