Skip to content
Snippets Groups Projects
Commit 6e583af3 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge remote-tracking branch 'origin/doc_style_guide' into 1.6 

Conflicts:
	doc/sphinx/dev_guide/building_documentation.rst
parents 584c3ae8 cc53cf54
Hide whitespace changes
Inline Side-by-side
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