package.json · 76c2b125dcf0988a1fe818a4496a2f4d1770beac · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-28 · 76c2b125

GitLab Bot authored Nov 28, 2018

# Conflicts:
#	app/assets/javascripts/diffs/components/inline_diff_view.vue
#	app/assets/javascripts/diffs/components/parallel_diff_view.vue

[ci skip]

76c2b125

Analyzing file…

package.json 5.28 KB

Replace package.json