mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 14:46:46 +00:00
6530f9709c
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. |
||
---|---|---|
.. | ||
active_record | ||
assets | ||
chewy/strategy | ||
devise | ||
generators/post_deployment_migration | ||
json_ld | ||
linter | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
simple_navigation | ||
tasks | ||
templates/haml/scaffold | ||
terrapin | ||
webpacker | ||
exceptions.rb | ||
public_file_server_middleware.rb |