mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 04:08:06 +01:00
077e0c6812
Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system. |
||
---|---|---|
.. | ||
base.rb | ||
history.rb | ||
links.rb | ||
preview_card_batch.rb | ||
preview_card_filter.rb | ||
preview_card_provider_batch.rb | ||
preview_card_provider_filter.rb | ||
query.rb | ||
status_batch.rb | ||
status_filter.rb | ||
statuses.rb | ||
tag_batch.rb | ||
tag_filter.rb | ||
tags.rb |