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

Merge remote-tracking branch 'origin/master' into 1.6

parents 1b769967 aa45f0a3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.gitignore
+ 1
− 1
View file @ 6b2e416f
......@@ -64,7 +64,7 @@ third_party/luajit/src/lj_vm.s
VERSION
!FreeBSD/databases/tarantool/Makefile
src/00000000000000000001.snap
doc/sphinx/_build/*
!doc/sphinx/_build/.gitignore
doc/www/content/doc
extra/dist/default/tarantool
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