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

Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.
This commit is contained in:
Claire
2023-06-10 18:42:29 +02:00
parent 34efd1a24c 3a2a15c6ea
commit 42a0898f16
66 changed files with 99 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/simple_form.en.yml
View File

@@ -297,6 +297,7 @@ en:
usable: Allow posts to use this hashtag
user:
role: Role
time_zone: Time zone
user_role:
color: Badge color
highlighted: Display role as badge on user profiles