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

Merge branch 'stable' 

Conflicts:
	CMakeLists.txt
	debian/libtarantool-dev.install
	debian/rules
	debian/tarantool-dev.install
	debian/tarantool-mysql-module.install
	debian/tarantool-postgresql-module.install
	debian/tarantool-sophia-module.install
	debian/tarantool-sql-module.install
	extra/rpm.spec.in
parents ab11009a 51ac1930
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