diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
commit | dc2ab6e646bb721ef2e1be268b876bd00e8fa802 (patch) | |
tree | a828f3968b151924656061bfc709b00565aff877 /package.json | |
parent | eeb8753adc98022a55051d45a137b02a2bff4c23 (diff) | |
parent | 02063c245c8a2a09e741cbce8302edf3ec14feef (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 1f9bb2695..df2c40175 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,9 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.7.7", + "@babel/core": "^7.8.3", "@babel/plugin-proposal-class-properties": "^7.8.3", - "@babel/plugin-proposal-decorators": "^7.8.0", + "@babel/plugin-proposal-decorators": "^7.8.3", "@babel/plugin-transform-react-inline-elements": "^7.8.0", "@babel/plugin-transform-runtime": "^7.7.6", "@babel/preset-env": "^7.8.3", |