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

Merge remote-tracking branch 'origin/gh-1277-sphinx-ru' into 1.7 

Conflicts:
	doc/sphinx/book/user_guide_getting_started.rst
	doc/sphinx/conf.py.in
	third_party/libyaml
parents dcce8627 6cda25d4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 31704 additions and 23 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