diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-07 18:51:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-07 18:51:55 +0000 |
| commit | ace3bcdda42ce7c9031d938f8dd53f207121654e (patch) | |
| tree | d66e4ae1cffe79ea5e535cf38e3e2cbc64816d27 /spec/serializers | |
| parent | d179f002d9a51ba3e082b5ae5943c0f31c694e4e (diff) | |
| parent | 22198466ca79b5f41282198f363a81fdb2ab3f2f (diff) | |
| download | gitlab-ce-ace3bcdda42ce7c9031d938f8dd53f207121654e.tar.gz | |
Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-fe
# Conflicts:
# locale/gitlab.pot
Diffstat (limited to 'spec/serializers')
0 files changed, 0 insertions, 0 deletions