Gina Häußge b6fbbb353a Merge branch 'maintenance' into devel ... # Conflicts: # CHANGELOG.md # src/octoprint/filemanager/storage.py # src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2		2016-09-09 12:31:29 +02:00
..
_static	[Docs] RTD needs a little extra help to get the code tag colors fixed...	2015-03-19 21:05:27 +01:00
api	Merge branch 'maintenance' into devel	2016-09-09 12:31:29 +02:00
configuration	Merge branch 'maintenance' into devel	2016-07-28 15:00:23 +02:00
development	More work on JS Client documentation	2016-08-26 17:47:38 +02:00
events	Extend payload in various events	2016-07-08 12:54:58 +02:00
features	Merge branch 'fix/m114CustomControlExample' into devel	2016-01-05 11:49:33 +01:00
images	[Docs] Forgot to check in an image	2015-04-15 18:57:30 +02:00
jsclientlib	More work on JS Client documentation	2016-08-26 17:47:38 +02:00
modules	devel:newplugin => dev:plugin new, +dev:plugin install, +dev:plugin uninstall	2015-10-30 10:10:47 +01:00
plugins	Renamed GcodeFileViewModel to FileViewModel	2016-09-01 10:17:18 +02:00
sphinxext	Typo and spelling fixes	2016-01-28 18:59:38 +00:00
conf.py	Typo and spelling fixes	2016-01-28 18:59:38 +00:00
index.rst	Added some developer information	2016-07-18 12:00:04 +02:00
make.bat	Starting documentation based on Sphinx	2013-12-02 17:40:31 +01:00
Makefile	Starting documentation based on Sphinx	2013-12-02 17:40:31 +01:00