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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
admin	Redesign admin accounts index (#9340)	6 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	8 years ago
home_helper.rb	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	7 years ago
jsonld_helper.rb	Improve federated ID validation (#8372)	6 years ago
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	7 years ago
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	7 years ago
settings_helper.rb	Add Czech language option and locale data (#8594)	6 years ago
stream_entries_helper.rb	Redesign admin accounts index (#9340)	6 years ago