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

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

Browse Source 
Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
This commit is contained in:
Thibaut Girka
2019-12-07 12:28:59 +01:00
parent 7d59e25fbd 6d7daf6154
commit abcba5c198
59 changed files with 873 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en.yml
View File

@ -78,6 +78,7 @@ en:
roles:
admin: Admin
bot: Bot
group: Group
moderator: Mod
unavailable: Profile unavailable
unfollow: Unfollow