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 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		6 years ago
..
admin	Fix nil error in admin_account_link_to helper (#8578)	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	Enable ro and ta locales in Rails (#8583)	6 years ago
stream_entries_helper.rb	Do not show follow button on moved or memorial accounts (#8546)	6 years ago