Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream. |
||
---|---|---|
.. | ||
accounts_cli.rb | ||
cache_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 |