OSDN Git Service

Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 1 Mar 2013 14:05:51 +0000 (16:05 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 1 Mar 2013 14:05:51 +0000 (16:05 +0200)
commit5c3cb47c16cacd8e9056f2a68978d69bc153a0f8
tree39204ec0a55c20310d1a92c5958ef7522ac86135
parenta73e58f70b264b36b3291bba9a8a2789235ccadb
parent2f1f05d431d1df062e46365930b98b358554a07d
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions

Conflicts:
db/schema.rb
db/schema.rb
features/steps/group/group.rb