Merge branch 'winh-update-licenses-10-2' into 'master'

Update licenses for 10.2 See merge request gitlab-org/gitlab-ce!15318

Merge branch 'winh-update-licenses-10-2' into 'master'
Update licenses for 10.2 See merge request gitlab-org/gitlab-ce!15318
820c646c · Oswaldo Ferreira · 3e763fda · 874d876e · 820c646c
Commit 820c646c authored Nov 10, 2017 by Oswaldo Ferreira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 205 additions and 23 deletions

vendor/licenses.csv vendor/licenses.csv +205 -23

No files found.
--- a/vendor/licenses.csv
+++ b/vendor/licenses.csv