mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-22 20:27:32 +02:00
193250556c
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did. |
||
---|---|---|
.. | ||
accounts_cli.rb | ||
cache_cli.rb | ||
canonical_email_blocks_cli.rb | ||
cli_helper.rb | ||
domains_cli.rb | ||
email_domain_blocks_cli.rb | ||
emoji_cli.rb | ||
feeds_cli.rb | ||
ip_blocks_cli.rb | ||
maintenance_cli.rb | ||
media_cli.rb | ||
migration_helpers.rb | ||
premailer_webpack_strategy.rb | ||
preview_cards_cli.rb | ||
rack_middleware.rb | ||
redis_config.rb | ||
search_cli.rb | ||
settings_cli.rb | ||
sidekiq_middleware.rb | ||
snowflake.rb | ||
statuses_cli.rb | ||
upgrade_cli.rb | ||
version.rb |