diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-13 15:11:26 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-13 15:11:26 +0200 |
| commit | 2ea12ff6632ce60cbd26200c7cd1306229ec21ec (patch) | |
| tree | 0597d4ab2ac6259821121f9653718f4c25fb50ac /lib/api | |
| parent | 95e4217a2b856a9c755f893a267e0ead1ce17d1c (diff) | |
| parent | 5e28710692dd1eb872b6c25e674c81c0593ed0ac (diff) | |
| download | gitlab-ce-2ea12ff6632ce60cbd26200c7cd1306229ec21ec.tar.gz | |
Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew-unicorn-app-dir-fix
Conflicts:
config/unicorn.rb.example
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions