diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-11 12:32:56 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-11 12:32:56 +0000 |
| commit | 0276b8682e37d361adbd1ac89d9ba6992f0d1b60 (patch) | |
| tree | 921c7b84db8492726b2b06baed09b5385f1f4440 /vendor/licenses.csv | |
| parent | ec7804444343cef3562d88aab2d255287a215430 (diff) | |
| parent | a409a77d5c5d75b02421e7d4a8a293c3469e7556 (diff) | |
| download | gitlab-ce-0276b8682e37d361adbd1ac89d9ba6992f0d1b60.tar.gz | |
Merge branch 'restore-hipchat' into 'master'
Revert "Remove HipChat integration from GitLab"
Closes #60042
See merge request gitlab-org/gitlab-ce!27172
Diffstat (limited to 'vendor/licenses.csv')
| -rw-r--r-- | vendor/licenses.csv | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vendor/licenses.csv b/vendor/licenses.csv index de6e32cb998..0c52cb5a947 100644 --- a/vendor/licenses.csv +++ b/vendor/licenses.csv @@ -520,6 +520,7 @@ hashie-forbidden_attributes,0.1.1,MIT he,1.1.1,MIT health_check,2.6.0,MIT highlight.js,9.13.1,New BSD +hipchat,1.5.2,MIT hmac-drbg,1.0.1,MIT hoopy,0.1.4,MIT html-pipeline,2.8.4,MIT |