summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-14 12:00:21 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-14 12:00:21 +0200
commit0d7986a8c7806a5d7630283f26667f954a5e61f7 (patch)
treedd99a049f0d1728fcb4a86a95a5f9afca0cf9cc6 /vendor
parent58e4e6b0819fcb385d790671d44c7a5051787e92 (diff)
parent9064fba071d06439ead76890015c3d38ffa63375 (diff)
downloadgitlab-ce-0d7986a8c7806a5d7630283f26667f954a5e61f7.tar.gz
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG db/schema.rb
Diffstat (limited to 'vendor')
0 files changed, 0 insertions, 0 deletions