diff options
| author | Marco Wessel <marco@poop.nl> | 2015-01-30 00:16:24 +0100 |
|---|---|---|
| committer | Marco Wessel <marco@poop.nl> | 2015-01-30 00:16:24 +0100 |
| commit | 20e269cb925cfad58cce0b19e17aa15075c4481e (patch) | |
| tree | d53e52bcc3881ca25f67b6cdeb473bf3d6290369 /lib/api/api.rb | |
| parent | 2a4502111e03c233861b545ae3ff3afd95614c4a (diff) | |
| parent | 604f39274dc1558f8710019e226b1a364f056d7e (diff) | |
| download | gitlab-ce-20e269cb925cfad58cce0b19e17aa15075c4481e.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection
Conflicts:
CHANGELOG
db/schema.rb
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions