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

Merge branch 'ocelot-master' 

Conflicts:
	doc/user/configuration-reference.xml
	doc/user/connectors.xml
	doc/user/databases.xml
	doc/user/server-administration.xml
parents 7ff161f4 d87b5b3b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 114 additions and 48 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