tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
This commit is contained in:
David Yip
2018-02-09 09:25:53 -06:00
parent 5ba2c300d8 235c14c79d
commit 020b40efdb
16 changed files with 55 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/simple_form.en.yml
View File

@ -46,6 +46,7 @@ en:
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
setting_favourite_modal: Show confirmation dialog before favouriting
setting_display_sensitive_media: Always show media marked as sensitive
setting_noindex: Opt-out of search engine indexing
setting_reduce_motion: Reduce motion in animations
setting_skin: Skin