mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 06:33:42 +01:00
7452a95998
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them. |
||
---|---|---|
.. | ||
attachment_extensions.rb | ||
blurhash_transcoder.rb | ||
color_extractor.rb | ||
gif_transcoder.rb | ||
image_extractor.rb | ||
lazy_thumbnail.rb | ||
response_with_limit_adapter.rb | ||
transcoder.rb | ||
type_corrector.rb | ||
url_generator_extensions.rb |