luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 20:32:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/announcements
History
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream 
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.
2022-11-14 08:35:55 +01:00
..
_announcement.html.haml Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
edit.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
index.html.haml Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
new.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00