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 b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		6 years ago
..
admin	Change icons of features on admin dashboard to remove bias (#10366)	6 years ago
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Add missing locales (bn, ga, hi) (#10295)	6 years ago
stream_entries_helper.rb	…