diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-30 10:14:56 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-30 10:14:56 +0200 |
| commit | b181d3124e4aefca59fb8fe64400eab8d9c73ad8 (patch) | |
| tree | d1a0964c8380abb5781a034dab95e95ac478f7f9 /lib/api/entities.rb | |
| parent | e5c8d2ca51566f18ef9f203ef90d4fe1fb4fbbfa (diff) | |
| parent | 43ba967b0556e2ff01526ff8298f015ec77830f6 (diff) | |
| download | gitlab-ce-b181d3124e4aefca59fb8fe64400eab8d9c73ad8.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/models/issue.rb
Diffstat (limited to 'lib/api/entities.rb')
0 files changed, 0 insertions, 0 deletions