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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		6 years ago
..
admin	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	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	Make avatar and headers respect `auto_play_gif` (#9515)	6 years ago
instance_helper.rb	…
jsonld_helper.rb	Do not error out on unsalvageable errors in FetchRepliesService (#10175)	6 years ago
routing_helper.rb	…
settings_helper.rb	I18n: Add language options for Kazakh and Lithuanian (#10104)	6 years ago
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago