Gina Häußge c3834c16fa Merge branch 'devel' into dev/gcodeScripts ... Conflicts: CHANGELOG.md src/octoprint/static/css/octoprint.css src/octoprint/static/js/app/viewmodels/timelapse.js src/octoprint/util/comm.py		2015-03-01 14:11:43 +01:00
..
api	Merge branch 'devel' into dev/gcodeScripts	2015-03-01 14:11:43 +01:00
apps	Send 401 Unauthorized instead of 403 Forbidden upon failed app session verification	2014-11-14 15:02:52 +01:00
util	Refactoring in octoprint.util	2015-02-27 10:28:16 +01:00
__init__.py	Merge branch 'devel' into dev/gcodeScripts	2015-03-01 14:11:43 +01:00