mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 04:39:23 +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. |
||
---|---|---|
.. | ||
chewy | ||
config/initializers | ||
controllers | ||
fabricators | ||
features | ||
fixtures | ||
generators | ||
helpers | ||
lib | ||
mailers | ||
models | ||
policies | ||
presenters | ||
requests | ||
routing | ||
serializers | ||
services | ||
support | ||
validators | ||
views/statuses | ||
workers | ||
fabricators_spec.rb | ||
rails_helper.rb | ||
spec_helper.rb |