diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-27 17:10:25 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-27 17:10:25 +0000 |
| commit | 61f65992a05e8fc5ab756ac0ce890d090c6cf4eb (patch) | |
| tree | 57952a5fa69f757bcd33247e6e3642ba98c6252b /yarn.lock | |
| parent | 44622abe9603c5419bc50212654f737343012ca8 (diff) | |
| parent | 883342ce36b5f38156a3376af7d8a2e274163917 (diff) | |
| download | gitlab-ce-61f65992a05e8fc5ab756ac0ce890d090c6cf4eb.tar.gz | |
Merge branch 'master' into 'add-svg-loader'
# Conflicts:
# app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yarn.lock b/yarn.lock index 565fe687a36..e4e5c40089b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4414,9 +4414,9 @@ vue-resource@^0.9.3: version "0.9.3" resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" -vue@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.0.3.tgz#3f7698f83d6ad1f0e35955447901672876c63fde" +vue@^2.1.10: + version "2.1.10" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.1.10.tgz#c9235ca48c7925137be5807832ac4e3ac180427b" watchpack@^1.2.0: version "1.2.1" |