mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-18 08:09:04 +01:00
1b0ff4cd69
Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb |
||
---|---|---|
.. | ||
accounts_cli.rb | ||
cache_cli.rb | ||
cli_helper.rb | ||
domains_cli.rb | ||
emoji_cli.rb | ||
feeds_cli.rb | ||
media_cli.rb | ||
migration_helpers.rb | ||
premailer_webpack_strategy.rb | ||
redis_config.rb | ||
search_cli.rb | ||
settings_cli.rb | ||
snowflake.rb | ||
statuses_cli.rb | ||
version.rb |