diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-12-15 16:24:14 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-12-15 16:24:14 +0100 |
| commit | d27befe64dd0d55bec2472ef641c4733cc669215 (patch) | |
| tree | 623db3d658408b42d8b25e923eb9ccf68016d9fa /lib/api/api.rb | |
| parent | 447e598ec4ee0d2fae29303d4359ffe6a06d3ba5 (diff) | |
| parent | 4493d3fd556af6ded47f940f258b0fc26c9eb3e8 (diff) | |
| download | gitlab-ce-d27befe64dd0d55bec2472ef641c4733cc669215.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passthrough
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 fe1bf8a4816..7834262d612 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -53,5 +53,6 @@ module API mount Settings mount Keys mount Tags + mount Triggers end end |