mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 17:44:14 -05:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
migration_helpers.rb | ||
premailer_webpack_strategy.rb | ||
redis_config.rb | ||
snowflake.rb | ||
version.rb |