diff options
author | ThibG <thib@sitedethib.com> | 2019-03-16 22:59:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-16 22:59:47 +0100 |
commit | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (patch) | |
tree | 239e6c3779ce64ee9833c3eec761ea158c2813b3 /package.json | |
parent | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff) | |
parent | 8ea344fed40ae1dccf5e1b6ecfd0014128c10fb7 (diff) |
Merge pull request #962 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 b5963acd4..0225f68da 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "cssnano": "^4.1.10", "detect-passive-events": "^1.0.2", "dotenv": "^6.2.0", - "emoji-mart": "Gargron/emoji-mart#build", + "emoji-mart": "^2.10.0", "es6-symbol": "^3.1.1", "escape-html": "^1.0.3", "exif-js": "^2.3.0", |