diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-30 14:41:16 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-30 14:41:16 +0100 |
commit | 8146271d4043a91e8f65c7af41c6c015e7d155c3 (patch) | |
tree | da09375c00d7931656cc790f053adf904d50c01e /lib/api/api.rb | |
parent | 57471894819c07796d2aa04e5a21d1a648a7751e (diff) | |
parent | 8388bbe82918d2fca2600620f48e048ccfab2c97 (diff) | |
download | gitlab-ce-8146271d4043a91e8f65c7af41c6c015e7d155c3.tar.gz |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup_restore_drop_sequences
Conflicts:
CHANGELOG
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 2c7cd9038c3..d26667ba3f7 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -27,6 +27,7 @@ module API helpers APIHelpers mount Groups + mount GroupMembers mount Users mount Projects mount Repositories |