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

This commit is contained in:
Thibaut Girka
2018-09-20 18:36:00 +02:00
3 changed files with 34 additions and 2 deletions

View File

@ -47,7 +47,7 @@ es:
one: Seguidor
other: Seguidores
following: Siguiendo
joined: Se unió el %{fecha}
joined: Se unió el %{date}
media: Media
moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
network_hidden: Esta información no está disponible