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

Merge branch 'ocelot-master' into 1.6

Conflicts:
	doc/sphinx/book/connectors/__c.rst
parents c5046acc 71aaa1e4
No related branches found
No related tags found
No related merge requests found
Showing
with 757 additions and 549 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment