tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
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.
This commit is contained in:
Claire
2022-11-14 08:35:55 +01:00
parent 81b1d32d5b b59ce0a60f
commit 32c70d2f09
171 changed files with 1816 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spec/fixtures/files/utf8-followers.txt vendored Normal file
View File

@ -0,0 +1 @@
@nare@թութ.հայ