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

Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/Analytics.js
This commit is contained in:
Michael Telatynski 2017-08-10 13:54:55 +01:00
commit b19c1010aa
No known key found for this signature in database
GPG key ID: 0435A1D4BBD34D64
25 changed files with 694 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/UserSettings.js
View file

@ -101,6 +101,10 @@ const SETTINGS_LABELS = [
id: 'MessageComposerInput.autoReplaceEmoji',
label: 'Automatically replace plain text Emoji',
},
{
id: 'Pill.shouldHidePillAvatar',
label: 'Hide avatars in user and room mentions',
},
/*
{
id: 'useFixedWidthFont',