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 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		6 years ago
..
admin	Avoid deleted attributes when building a Status from action log (fixes #8371) (#8373)	6 years ago
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flashes_helper.rb	…
home_helper.rb	Add remote interaction dialog for toots (#8202)	6 years ago
instance_helper.rb	…
jsonld_helper.rb	Improve federated ID validation (#8372)	6 years ago
mailer_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Add Georgian language translation (#8250)	6 years ago
stream_entries_helper.rb	Better singulars of account followers/toots. (#8471)	6 years ago