diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-20 10:33:24 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-20 10:33:24 +0200 |
commit | df150da4355bb224913f6de2940c9135714fb53f (patch) | |
tree | 0301dfdea48280c3942fc00da2d478f9360c148c /package.json | |
parent | 1d40325e7c9f8f380d4bb2ac55beedfb1bef5009 (diff) | |
parent | 97af209c3113926534fe8c5adb7ad51fa4527cbe (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/initializers/content_security_policy.rb (took our version)
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 6bbe87f11..6f6730b9a 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "react-notification": "^6.8.4", "react-overlays": "^0.8.3", "react-redux": "^7.1.0", - "react-redux-loading-bar": "^4.4.0", + "react-redux-loading-bar": "^4.0.8", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", "react-select": "^2.4.4", |