Skip to content
Snippets Groups Projects
  • Roman Tsisyk's avatar
    6a8ba4c8
    Merge branch 'stable' · 6a8ba4c8
    Roman Tsisyk authored
    Conflicts:
    	src/lua/init.cc
    	test/box/fiber.result
    	test/box/fiber.test
    	test/module/net_sql.mysql.result
    	test/module/net_sql.mysql.test
    6a8ba4c8
    History
    Merge branch 'stable'
    Roman Tsisyk authored
    Conflicts:
    	src/lua/init.cc
    	test/box/fiber.result
    	test/box/fiber.test
    	test/module/net_sql.mysql.result
    	test/module/net_sql.mysql.test