mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 06:38:39 +09:00
e25cc4deb7
Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream 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 |