mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-15 19:33:32 +00:00
abfdafef1e
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper.rb | ||
| application_helper.rb | ||
| branding_helper.rb | ||
| context_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 | ||
| routing_helper.rb | ||
| settings_helper.rb | ||
| statuses_helper.rb | ||
| webfinger_helper.rb | ||