diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-03 13:13:06 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-03 13:13:06 +0200 |
| commit | 2197ee02e95ade455785cc1769bf3a40a082a799 (patch) | |
| tree | 387a303a1bce6e5002c78a6d41c904ceffe2b357 /yarn.lock | |
| parent | d0ffbd18fa5be4e90d150bc617d0cc7eb3c8720b (diff) | |
| parent | 1018ab0516fd94d1ffbc05a0ad8499947dd9630d (diff) | |
| download | gitlab-ce-2197ee02e95ade455785cc1769bf3a40a082a799.tar.gz | |
Merge branch 'master' into ide
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/yarn.lock b/yarn.lock index 81d1a3a20dc..7af7f6d8554 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1433,6 +1433,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2: create-hash "^1.1.0" inherits "^2.0.1" +cropper@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cropper/-/cropper-2.3.0.tgz#607461d4e7aa7a7fe15a26834b14b7f0c2801562" + dependencies: + jquery ">= 1.9.1" + cryptiles@2.x.x: version "2.0.5" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" @@ -3232,7 +3238,7 @@ jquery-ujs@^1.2.1: dependencies: jquery ">=1.8.0" -jquery@>=1.8.0, jquery@^2.2.1: +"jquery@>= 1.9.1", jquery@>=1.8.0, jquery@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f" |