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 /package.json | |
| 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 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index ddbf4a3293c..48cff0d7661 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "stats-webpack-plugin": "^0.4.3", "timeago.js": "^2.0.5", "underscore": "^1.8.3", - "vue": "^2.0.3", + "vue": "^2.1.10", "vue-resource": "^0.9.3", "webpack": "^2.2.1", "webpack-bundle-analyzer": "^2.3.0" |