diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-02 09:11:55 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-02 09:11:55 +0000 |
| commit | ef7001c9c641c1e77ae203650efc0d9aa71a2e3e (patch) | |
| tree | 86a95ca38c95806f7d8177f59353776349235b52 /package.json | |
| parent | dc3d778fac4f9b0d4fbcb574f9ef3b0cd11ad640 (diff) | |
| parent | 6068b863c66f785bea0a56881d60e8c23da08a0b (diff) | |
| download | gitlab-ce-ef7001c9c641c1e77ae203650efc0d9aa71a2e3e.tar.gz | |
Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
# spec/features/projects/commit/cherry_pick_spec.rb
# spec/features/projects/environments/environment_spec.rb
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package.json b/package.json index e9964b8b638..c7c54c4244c 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "jszip-utils": "^0.0.2", "marked": "^0.3.6", "mousetrap": "^1.4.6", + "pdfjs-dist": "^1.8.252", "pikaday": "^1.5.1", "prismjs": "^1.6.0", "raphael": "^2.2.7", @@ -47,6 +48,7 @@ "three-stl-loader": "^1.0.4", "timeago.js": "^2.0.5", "underscore": "^1.8.3", + "url-loader": "^0.5.8", "visibilityjs": "^1.2.4", "vue": "^2.2.6", "vue-loader": "^11.3.4", |