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.

Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		4 years ago
..
admin	Add IP-based rules (#14963)	4 years ago
settings	…
accounts_helper.rb	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
domain_control_helper.rb	…
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	…
mascot_helper.rb	Use custom mascot on static share page (#15687)	4 years ago
routing_helper.rb	…
settings_helper.rb	Add missing locales (#15138)	4 years ago
statuses_helper.rb	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	4 years ago
webfinger_helper.rb	…