mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 04:07:45 +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. |
||
---|---|---|
.. | ||
active_record | ||
assets | ||
chewy/strategy | ||
devise | ||
generators/post_deployment_migration | ||
json_ld | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
simple_navigation | ||
tasks | ||
templates/haml/scaffold | ||
terrapin | ||
webpacker | ||
cli.rb | ||
exceptions.rb | ||
public_file_server_middleware.rb |