Merge branch 'develop' into 'reactions-page'

# Conflicts:
#   app/soapbox/utils/features.js
This commit is contained in:
marcin mikołajczak
2021-09-09 20:48:30 +00:00
71 changed files with 2781 additions and 2988 deletions

View File

@@ -190,6 +190,10 @@ export function SoapboxConfig() {
return import(/* webpackChunkName: "features/soapbox_config" */'../../soapbox_config');
}
export function ExportData() {
return import(/* webpackChunkName: "features/export_data" */ '../../export_data');
}
export function ImportData() {
return import(/* webpackChunkName: "features/import_data" */'../../import_data');
}