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
..
assets	Add emoji autosuggest (#5053)	7 years ago
devise	…
generators	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
paperclip	Unconditionally re-encode locally-uploaded images to strip metadata	6 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
templates	…
cli.rb	Move more tasks to tootctl (#8675)	6 years ago