You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
_detailed_status.html.haml	Add a new preference to always hide all media (#8569)	6 years ago
_og_description.html.haml	…
_og_image.html.haml	…
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
_status.html.haml	Revert Font Awesome 5 upgrade (#8810)	6 years ago
embed.html.haml	Add animate custom emoji param to embed pages (#8507)	6 years ago
show.html.haml	Add remote interaction dialog for toots (#8202)	6 years ago