mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-05 06:26:21 +00:00
be4849c083
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
webpack | ||
application.rb | ||
boot.rb | ||
brakeman.ignore | ||
database.yml | ||
deploy.rb | ||
environment.rb | ||
i18n-tasks.yml | ||
navigation.rb | ||
pghero.yml | ||
puma.rb | ||
routes.rb | ||
secrets.yml | ||
settings.yml | ||
sidekiq.yml | ||
webpacker.yml |