config/unicorn.rb.example · 4e9add7c2c118a16b205cef9ccf7bfb314116844 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Dec 09, 2013
906c65b6
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq · 906c65b6
Crom (Thibaut CHARLES) authored Dec 09, 2013
```
Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example
```
906c65b6
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
Crom (Thibaut CHARLES) authored Dec 09, 2013
```
Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example
```