diff options
| author | Reverite <github@reverite.sh> | 2019-05-21 20:48:57 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-21 20:48:57 -0700 |
| commit | d873e4f3d5878a2b2800758cbe3b9c870c228d51 (patch) | |
| tree | 23a3a373699381d4bd4f629136b9c82de5df96a3 /app/javascript/flavours/glitch/features/local_settings | |
| parent | 4cea89bf2e9ce7f73fccfc637191b1e039ad25ee (diff) | |
| parent | 2332b3f146b0d879daba8a99bd35c8bf425edea3 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/javascript/flavours/glitch/features/local_settings')
| -rw-r--r-- | app/javascript/flavours/glitch/features/local_settings/page/index.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.js b/app/javascript/flavours/glitch/features/local_settings/page/index.js index a13bffa3a..cd2d86713 100644 --- a/app/javascript/flavours/glitch/features/local_settings/page/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js @@ -153,6 +153,14 @@ export default class LocalSettingsPage extends React.PureComponent { </LocalSettingsPageItem> <LocalSettingsPageItem settings={settings} + item={['show_content_type_choice']} + id='mastodon-settings--show_content_type_choice' + onChange={onChange} + > + <FormattedMessage id='settings.show_content_type_choice' defaultMessage='Show content-type choice when authoring toots' /> + </LocalSettingsPageItem> + <LocalSettingsPageItem + settings={settings} item={['side_arm']} id='mastodon-settings--side_arm' options={[ |