mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-26 16:01:37 +01:00
2810231180
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| admin.html.haml | ||
| admin_mailer.text.erb | ||
| application.html.haml | ||
| auth.html.haml | ||
| embedded.html.haml | ||
| error.html.haml | ||
| helper_frame.html.haml | ||
| mailer.html.haml | ||
| mailer.text.erb | ||
| modal.html.haml | ||