mirror of https://github.com/tootsuite/mastodon
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 | ||