pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
MrDraw/docs
History
Gina Häußge aae01fe81b Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	docs/api/fileops.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/api/files.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/sidebar/state.jinja2
	src/octoprint/util/comm.py
2016-07-28 15:00:23 +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-07-28 15:00:23 +02:00
configuration Merge branch 'maintenance' into devel 2016-07-28 15:00:23 +02:00
development Added some developer information 2016-07-18 12:00:04 +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 the docs 2016-07-01 17:52:40 +02:00
modules devel:newplugin => dev:plugin new, +dev:plugin install, +dev:plugin uninstall 2015-10-30 10:10:47 +01:00
plugins Merge pull request #1384 from docdawning/patch-2 2016-07-13 17:53:24 +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