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 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		6 years ago
..
admin	Add dormant filter to relationship manager, rename other filters (#10308)	6 years ago
settings	…
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	Add missing locales (bn, ga, hi) (#10295)	6 years ago
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago