mirror of https://github.com/Siphonay/mastodon
ac2370778a
Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes. |
||
---|---|---|
.. | ||
cli | ||
migration_helpers.rb | ||
migration_warning.rb | ||
premailer_webpack_strategy.rb | ||
rack_middleware.rb | ||
redis_config.rb | ||
sidekiq_middleware.rb | ||
snowflake.rb | ||
version.rb |