| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2023-02-09 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes. | |||
| 2023-02-04 | Add setting for status page URL (#23390) | Eugen Rochko | |
| 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 |