OSDN Git Service

Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former0...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 27 May 2013 12:05:01 +0000 (15:05 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 27 May 2013 12:05:01 +0000 (15:05 +0300)
commitc3ba0ee64b00a57490dbc9a745e2c422268a9117
tree0f18600e1a47554f7f1c5590f5604cbc7fb0ccda
parent69d70400cc8ee3ea02e5c66b92b5965dcbe6fa76
parent0ebfa5e5a2f93cb57e00159aa20ec8bf52dba67e
Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api

Conflicts:
doc/api/README.md
doc/api/README.md
lib/api/api.rb