mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 11:53:13 +00:00
32c70d2f09
Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes. |
||
---|---|---|
.. | ||
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 |