mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 21:59:04 +09: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. |
||
---|---|---|
.. | ||
files | ||
push | ||
requests | ||
salmon |