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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
admin	Add search and sort functions to hashtag admin UI (#11829)	5 years ago
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_control_helper.rb	Add whitelist mode (#11291)	5 years ago
flashes_helper.rb	…
home_helper.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	5 years ago
jsonld_helper.rb	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	5 years ago
routing_helper.rb	…
settings_helper.rb	Add account migration UI (#11846)	5 years ago
statuses_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago