mirror of https://github.com/tootsuite/mastodon
cd99255698
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both. |
||
|---|---|---|
| .. | ||
| accounts_cli.rb | ||
| cli_helper.rb | ||
| emoji_cli.rb | ||
| media_cli.rb | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| redis_config.rb | ||
| snowflake.rb | ||
| version.rb | ||