| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2022-11-14 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 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-13 | Fix saving server registration settings redirecting to branding settings ↵ | Claire | |
| (#20505) | |||
| 2022-11-12 | Add “Glitch-only” label to glitch-specific settings | Claire | |
| 2022-10-28 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-10-22 | Change settings area to be separated into categories in admin UI (#19407) | Eugen Rochko | |
| And update all descriptions | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |