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

Merge branch 'master' of github.com:tarantool/tarantool

Conflicts:
	doc/sphinx/book/connectors/index.rst
parents a1fee55c 922e3b66
No related branches found
No related tags found
No related merge requests found
Showing
with 73 additions and 82 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