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

Merge branch 'stable'

Conflicts:
	cmake/compiler.cmake
	include/sio.h
	src/box/bitset_index.cc
	src/box/box_lua.cc
	src/lua/init.cc
	src/lua/session.cc
	src/sio.cc
	test/unit/objc_catchcxx.m
	third_party/luajit
parents 64dbf74d 5dcc6f76
No related merge requests found
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