be4849c083
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system |
||
---|---|---|
.. | ||
assets | ||
chewy/strategy | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |
be4849c083
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system |
||
---|---|---|
.. | ||
assets | ||
chewy/strategy | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |