Skip to content
Snippets Groups Projects
Commit 83b643a0 authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-token 

# Conflicts:
#	app/controllers/projects/git_http_client_controller.rb
#	app/helpers/lfs_helper.rb
#	lib/gitlab/auth.rb
#	spec/requests/lfs_http_spec.rb
parents eed5c58d be09bcf0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 237 additions and 74 deletions
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