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

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Browse Source 
Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
5bf5003384.
It was resolved by accepting tootsuite's changes.
This commit is contained in:
David Yip
2018-06-07 05:13:49 -05:00
parent f8d50a4070 2304d52599
commit 8142bd2553
75 changed files with 436 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/sk.yml
View File

@ -50,6 +50,7 @@ sk:
reserved_username: Prihlasovacie meno je rezervované
roles:
admin: Administrátor
bot: Automat
moderator: Moderátor
unfollow: Prestať sledovať
admin: