From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 15 Apr 2020 15:07:49 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=66ad30db489ddb2b3ecc98d284aabd47c9d4ae84;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
- `yarn.lock`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
---

66ad30db489ddb2b3ecc98d284aabd47c9d4ae84
diff --cc package.json
index 82f918456,62c3251f4..684dff375
--- a/package.json
+++ b/package.json
@@@ -73,8 -72,7 +73,8 @@@
      "@rails/ujs": "^6.0.2",
      "array-includes": "^3.1.1",
      "arrow-key-navigation": "^1.1.0",
 +    "atrament": "0.2.4",
-     "autoprefixer": "^9.7.5",
+     "autoprefixer": "^9.7.6",
      "axios": "^0.19.2",
      "babel-loader": "^8.1.0",
      "babel-plugin-lodash": "^3.3.4",
diff --cc yarn.lock
index f54668e58,b9bc6e334..58bd9243c
--- a/yarn.lock
+++ b/yarn.lock
@@@ -1947,18 -1947,13 +1947,18 @@@ atob@^2.1.2
    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
  
 +atrament@0.2.4:
 +  version "0.2.4"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.4.tgz#6f78196edfcd194e568b7c0b9c88201ec371ac66"
 +  integrity sha512-hSA9VwW6COMwvRhSEO4uZweZ91YGOdHqwvslNyrJZG+8mzc4qx/qMsDZBuAeXFeWZO/QKtRjIXguOUy1aNMl3A==
 +
- autoprefixer@^9.7.5:
-   version "9.7.5"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.5.tgz#8df10b9ff9b5814a8d411a5cfbab9c793c392376"
-   integrity sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==
+ autoprefixer@^9.7.6:
+   version "9.7.6"
+   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"
+   integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==
    dependencies:
-     browserslist "^4.11.0"
-     caniuse-lite "^1.0.30001036"
+     browserslist "^4.11.1"
+     caniuse-lite "^1.0.30001039"
      chalk "^2.4.2"
      normalize-range "^0.1.2"
      num2fraction "^1.2.2"