Merge tag 'v3.1.2' into hometown-dev

This commit is contained in:
Darius Kazemi
2020-03-02 10:01:54 -08:00
33 changed files with 571 additions and 394 deletions

View File

@ -661,6 +661,7 @@ en:
trouble_logging_in: Trouble logging in?
authorize_follow:
already_following: You are already following this account
already_requested: You have already sent a follow request to that account
error: Unfortunately, there was an error looking up the remote account
follow: Follow
follow_request: 'You have sent a follow request to:'