mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-15 19:33:32 +00:00
1a664560cc
Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes. |
||
---|---|---|
.. | ||
action_controller | ||
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 |