mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 11:53:13 +00:00
44a5f1b64a
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README |
||
---|---|---|
.. | ||
chewy | ||
config/initializers | ||
controllers | ||
fabricators | ||
features | ||
fixtures | ||
generators | ||
helpers | ||
lib | ||
locales | ||
mailers | ||
models | ||
policies | ||
presenters | ||
requests | ||
routing | ||
serializers | ||
services | ||
support | ||
system | ||
validators | ||
views/statuses | ||
workers | ||
rails_helper.rb | ||
spec_helper.rb |