mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-27 23:56:56 +00:00
2126812f65
Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper.rb | ||
| application_helper.rb | ||
| branding_helper.rb | ||
| context_helper.rb | ||
| database_helper.rb | ||
| domain_control_helper.rb | ||
| email_helper.rb | ||
| flashes_helper.rb | ||
| formatting_helper.rb | ||
| home_helper.rb | ||
| instance_helper.rb | ||
| jsonld_helper.rb | ||
| languages_helper.rb | ||
| mascot_helper.rb | ||
| media_component_helper.rb | ||
| react_component_helper.rb | ||
| routing_helper.rb | ||
| settings_helper.rb | ||
| statuses_helper.rb | ||
| webfinger_helper.rb | ||