diff options
| author | John Jarvis <jarv@gitlab.com> | 2019-03-05 13:28:59 +0300 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-03-05 13:28:59 +0300 |
| commit | 83cb7482560c04d14fda372fcb4f95d667cd1962 (patch) | |
| tree | ec36cfddb359467a35276a99b5bc872b1fdfb7e2 /jest.config.js | |
| parent | 960101c20bb8ec5a2d1d3f01474676c7ea95adc7 (diff) | |
| parent | a24eabb1782785ad0bcf2460c3fff67106598b83 (diff) | |
Merge branch 'merge-dev-to-master' into 'master'
Merge dev.gitlab.org master into GitLab.com master
Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787
See merge request gitlab-org/gitlab-ce!25746
Diffstat (limited to 'jest.config.js')
0 files changed, 0 insertions, 0 deletions