Skip to content
Snippets Groups Projects
Commit 93db3fc2 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Merge branch 'stable' 

Conflicts:
	connector/c/include/tp.h
	src/lua/init.cc
	test/connector_c/tp.c
parents 117685af a24874dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 37 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