config/puma.rb.example · efd1b69f68eaf6650bf84b57a4c3f6948ac204e4 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge branch 'master' into 6-0-dev · 6ace422c
Dmitriy Zaporozhets authored Jul 08, 2013
```
Conflicts:
	Gemfile
	Gemfile.lock
```
6ace422c

puma.rb.example 2.95 KB