Skip to content
Snippets Groups Projects
Commit ee2a4bf4 authored by Daniel Salzman's avatar Daniel Salzman
Browse files

Merge branch 'sphinx' 

Conflicts:
	doc/installation.texi
	doc/running.texi
parents 35d4fe12 874db9c6
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2367 additions and 2053 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment