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

Merge remote-tracking branch 'origin/stable' 

Conflicts:
	doc/user/connectors.xml
	doc/user/stored-procedures.xml
	doc/user/tutorial.xml
	src/coio.cc
	src/evio.cc
	src/evio.h
parents da817dab 8d7a7a25
No related branches found
No related tags found
No related merge requests found
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