Merge branch 'develop' into 'reactions-page'

# Conflicts: # app/soapbox/utils/features.js
2021-09-09 20:48:30 +00:00
parent 660661451c 0994d78edb
commit c2fc7a0331
71 changed files with 2781 additions and 2988 deletions
--- a/app/soapbox/utils/features.js
+++ b/app/soapbox/utils/features.js
@@ -24,6 +24,7 @@ export const getFeatures = createSelector([
    securityAPI: v.software === 'Pleroma',
    settingsStore: v.software === 'Pleroma',
    accountAliasesAPI: v.software === 'Pleroma',
+    resetPasswordAPI: v.software === 'Pleroma',
    exposableReactions: features.includes('exposable_reactions'),
  };
 });