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	Add specs for Admin::AccountModerationNotesHelper (#9455)	6 years ago
settings	…
application_helper_spec.rb	Admission-based registrations mode (#10250)	6 years ago
flashes_helper_spec.rb	…
home_helper_spec.rb	…
instance_helper_spec.rb	…
jsonld_helper_spec.rb	Add pending specs for jsonld helper (#9750)	6 years ago
routing_helper_spec.rb	…
settings_helper_spec.rb	…
stream_entries_helper_spec.rb	…