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 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		6 years ago
..
admin	Admission-based registrations mode (#10250)	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	…
home_helper.rb	Admission-based registrations mode (#10250)	6 years ago
instance_helper.rb	…
jsonld_helper.rb	Fix poll update handler calling method was that was not available (#10246)	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