Skip to content
Snippets Groups Projects
Commit 906c65b6 authored by Crom (Thibaut CHARLES)'s avatar Crom (Thibaut CHARLES)
Browse files

Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 

Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example
parents 87fc3507 dbf8ae73
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 292 additions and 128 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