diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:33:41 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:33:41 +0200 |
commit | aae60a2366d6dadbcc4a0197d4dd17afc931c8a0 (patch) | |
tree | 0bbbc278809d9990365a2d79abeaf02891990d51 /package.json | |
parent | 5d12b63e79953a7596ae473706985b774d4e51a6 (diff) | |
parent | bb9ca8a587ee5a3ec8778e72828aca0ba8871327 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported 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 ba47aa059..4a612fc20 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "requestidlecallback": "^0.3.0", "reselect": "^4.0.0", "rimraf": "^3.0.2", - "sass": "^1.26.5", + "sass": "^1.26.8", "sass-loader": "^8.0.2", "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", |