Skip to content
Snippets Groups Projects
Commit 3be99d0d authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'stable' 

Conflicts:
	.gitmodules
parents 7ece7155 9ab809a6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
.gitmodules
+ 2
− 2
View file @ 3be99d0d
[submodule "third_party/lua-cjson"]
path = third_party/lua-cjson
url = git://github.com/mpx/lua-cjson.git
url = https://github.com/mpx/lua-cjson.git
[submodule "third_party/luajit"]
path = third_party/luajit
url = git://github.com/tarantool/luajit.git
url = https://github.com/tarantool/luajit.git
[submodule "test/lib/tarantool-python"]
path = test/lib/tarantool-python
url = https://github.com/mailru/tarantool-python.git
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