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

Merge branch 'stable' 

Conflicts:
	.gitmodules
parents f075944b fd68c353
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitmodules
+ 1
− 1
View file @ 99e4338a
......@@ -3,7 +3,7 @@
url = git://github.com/mpx/lua-cjson.git
[submodule "third_party/luajit"]
path = third_party/luajit
url = http://luajit.org/git/luajit-2.0.git
url = git://github.com/tarantool/luajit.git
[submodule "test/lib/tarantool-python"]
path = test/lib/tarantool-python
url = https://github.com/mailru/tarantool-python.git
luajit @ 4fba08a9
Subproject commit 21af151af28d4b3524684b106bd19b02484f67f1
Subproject commit 4fba08a9aca4ce99a6a51f5faca2e1e091ad1422
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