Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-25 11:56:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,876 Commits 74 Branches 58 Tags
bbd0e9caa67e2cc0b7b34bbc04885cef751d8d6f
Commit Graph

4 Commits

Author SHA1 Message Date
Claire
85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream 
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-09 12:46:12 +01:00
Eugen Rochko
8f590b0a21 Add setting for status page URL (#23390) 2023-02-04 04:56:06 +01:00
Claire
cb19be67d1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
Eugen Rochko
7c152acb2c Change settings area to be separated into categories in admin UI (#19407) 
And update all descriptions
 2022-10-22 11:44:41 +02:00