Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code. |
||
---|---|---|
.. | ||
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 | ||
redis_config.rb | ||
search_cli.rb | ||
settings_cli.rb | ||
snowflake.rb | ||
statuses_cli.rb | ||
upgrade_cli.rb | ||
version.rb |