diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-27 15:05:01 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-27 15:05:01 +0300 |
| commit | c3ba0ee64b00a57490dbc9a745e2c422268a9117 (patch) | |
| tree | 0f18600e1a47554f7f1c5590f5604cbc7fb0ccda /lib/api/api.rb | |
| parent | 69d70400cc8ee3ea02e5c66b92b5965dcbe6fa76 (diff) | |
| parent | 0ebfa5e5a2f93cb57e00159aa20ec8bf52dba67e (diff) | |
| download | gitlab-ce-c3ba0ee64b00a57490dbc9a745e2c422268a9117.tar.gz | |
Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api
Conflicts:
doc/api/README.md
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index c2752406122..9571d49d9d5 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -35,5 +35,6 @@ module API mount Notes mount Internal mount SystemHooks + mount UserTeams end end |