4 commits

Author	SHA1	Message	Date
Gina Häußge	16f5e54bd7	Merge branch 'devel' into sdcard ... Conflicts: octoprint/server.py octoprint/settings.py octoprint/static/js/ui.js octoprint/util/comm.py	2013-05-23 22:53:34 +02:00
Gina Häußge	039a17d923	First try at SD card support	2013-05-20 19:18:03 +02:00
Gina Häußge	d721e5edc2	Merge branch 'devel' into repetier ... Conflicts: octoprint/util/comm.py	2013-04-16 15:14:18 +02:00
Gina Häußge	19dc238f06	User management now working ... Also reorganized javascripts a bit (as preparation for some refactoring coming up) and renamed templates from ".html" to ".jinja2".	2013-04-13 22:21:53 +02:00

Renamed from octoprint/templates/settings.html (Browse further)