diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-19 18:30:59 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-19 18:30:59 +0100 |
| commit | 4f44455626a567c939bf6f84684e8879ce2db829 (patch) | |
| tree | ead6521f29b5d0f2e194a2aaea7becb3007fcbb0 /lib/api/files.rb | |
| parent | 98e1a5b63424b6912de98ee5055d3f9e57e63899 (diff) | |
| parent | c8d66514efcf946f847cb3120b271d8f0f0327f2 (diff) | |
| download | gitlab-ce-4f44455626a567c939bf6f84684e8879ce2db829.tar.gz | |
Merge branch 'master' into user-ldap-email
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions