imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs

Browse source 
 Conflicts:
	package.json
This commit is contained in:
Michael Telatynski 2020-08-03 12:54:06 +01:00
commit cbcac9dd49
321 changed files with 9161 additions and 4040 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rageshake/submit-rageshake.ts
View file

@ -122,7 +122,7 @@ async function collectBugReport(opts: IOpts) {
}
// add labs options
const enabledLabs = SettingsStore.getLabsFeatures().filter(SettingsStore.isFeatureEnabled);
const enabledLabs = SettingsStore.getLabsFeatures().filter(f => SettingsStore.isFeatureEnabled(f));
if (enabledLabs.length) {
body.append('enabled_labs', enabledLabs.join(', '));
}