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

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

Browse Source 
Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
This commit is contained in:
David Yip
2018-01-28 22:45:17 -06:00
parent 00ce2be148 e14c20582f
commit f4b2478af1
69 changed files with 2582 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/fr.yml
View File

@ -116,7 +116,7 @@ fr:
roles:
admin: Administrateur
moderator: Modérateur
staff: Personnel
staff: Équipe
user: Utilisateur
salmon_url: URL Salmon
search: Rechercher