Skip to content
Snippets Groups Projects
  • bigbes's avatar
    427637f1
    Merge branch 'stable' · 427637f1
    bigbes authored
    Conflicts:
    	src/box/CMakeLists.txt
    	src/ffisyms.cc
    	src/lib/CMakeLists.txt
    	src/lib/salad/CMakeLists.txt
    	src/lua/digest.lua
    	test/box/digest.test
    	test/unit/CMakeLists.txt
    427637f1
    History
    Merge branch 'stable'
    bigbes authored
    Conflicts:
    	src/box/CMakeLists.txt
    	src/ffisyms.cc
    	src/lib/CMakeLists.txt
    	src/lib/salad/CMakeLists.txt
    	src/lua/digest.lua
    	test/box/digest.test
    	test/unit/CMakeLists.txt