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 /package.json | |
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 'package.json')
-rw-r--r-- | package.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/package.json b/package.json index 8a50afdb6..491a487d2 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "file-loader": "^0.11.2", "font-awesome": "^4.7.0", "glob": "^7.1.1", - "hammerjs": "^2.0.8", "http-link-header": "^0.8.0", "immutable": "^3.8.2", "imports-loader": "^0.8.0", |