mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
fe5f6bc7ed
Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property |
||
|---|---|---|
| .. | ||
| 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 | ||