mirror of https://framagit.org/tykayn/mastodon.git
b2915613fb
Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream. |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| challenge.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| ip_block_batch.rb | ||
| preview_card_batch.rb | ||
| preview_card_provider_batch.rb | ||
| redirect.rb | ||
| tag_batch.rb | ||
| two_factor_confirmation.rb | ||