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 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		6 years ago
..
admin	Add order options to relationship manager UI (#10404)	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