diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-04 13:56:58 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-04 13:56:58 -0500 |
commit | 3ab6a8b8bed37d048909b178693af8411325eb38 (patch) | |
tree | db371121cbfb240d1338e803dff136f3023c2b87 /yarn.lock | |
parent | bda1782cd864ed3aabb5a4d87359a1cb7595f4a6 (diff) | |
parent | 1c1042556d21e4c2eb22b7c5cbc11aa88087ca60 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: spec/views/about/show.html.haml_spec.rb
Diffstat (limited to 'yarn.lock')
-rw-r--r-- | yarn.lock | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/yarn.lock b/yarn.lock index e21df9cb4..03915eafe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3100,10 +3100,6 @@ gzip-size@^3.0.0: dependencies: duplexer "^0.1.1" -hammerjs@^2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1" - handle-thing@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" |