OSDN Git Service

Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlab...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 27 May 2013 12:17:06 +0000 (15:17 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 27 May 2013 12:17:06 +0000 (15:17 +0300)
commitec1055076c400a579d87fe970da342617efd4f94
treebb331e0a8d725156541fe9f33225d1db5947268e
parent01d8c7d6dd27410c41447c867e96d6587f17572f
parent22279bc55870435c61d5e8208cc3117ef2268052
Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team

Conflicts:
config/gitlab.yml.example
app/models/user.rb
config/gitlab.yml.example
lib/gitlab/auth.rb