diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-06 21:13:27 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-06 21:13:27 +0000 |
| commit | d617182a1a6f9b19a8a6d117fa3e507fa2b338a8 (patch) | |
| tree | e24db462cfb8ed1854e2203a78d6d22b071232e5 /lib/api | |
| parent | f96d5112dca596fb85718b3cca2a7b30b3877207 (diff) | |
| parent | b70d151db99d6d64f3514006c4fa6c8142e1b785 (diff) | |
| download | gitlab-ce-d617182a1a6f9b19a8a6d117fa3e507fa2b338a8.tar.gz | |
Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-db
# Conflicts:
# spec/models/group_spec.rb
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions