OSDN Git Service

Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
authorCrom (Thibaut CHARLES) <crom29@hotmail.fr>
Mon, 9 Dec 2013 13:22:22 +0000 (13:22 +0000)
committerCrom (Thibaut CHARLES) <crom29@hotmail.fr>
Mon, 9 Dec 2013 13:22:22 +0000 (13:22 +0000)
commit906c65b6243e1f55f96d58cc1d4d60dd64c5cc65
tree5cb5fd0246da052d619502dcb595e5138edf4706
parent87fc35073a1f5ae84798263fc7c789a32f85d637
parentdbf8ae7301b50d1652ce1ccbf974e8b8ac88ffd3
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq

Conflicts:
config/application.rb
config/gitlab.yml.example
config/unicorn.rb.example
config/application.rb
config/gitlab.yml.example
config/unicorn.rb.example