summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-02-14 21:40:02 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-02-14 21:40:02 +0000
commitb4c00ae43dda8e32061539f3177a4294a706efc9 (patch)
treefcde13db86c91458d10963bd860f7e9a2a977878 /package.json
parent8a45865968b42b09242218bbccc12c4d84786c73 (diff)
parentb7aa096129c42877596c3261838439f99216c077 (diff)
downloadgitlab-ce-b4c00ae43dda8e32061539f3177a4294a706efc9.tar.gz
Merge branch 'fix-yarn-lock' into 'master'
Fix yarn lock and package.json mismatch caused by MR 9133 See merge request !9239
Diffstat (limited to 'package.json')
0 files changed, 0 insertions, 0 deletions