Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Shpuld Shpludson 2020-07-02 04:50:03 +00:00
commit c0fb35b106
9 changed files with 32 additions and 42 deletions

View file

@ -618,6 +618,7 @@
"no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
"repeated": "repeated",
"show_new": "Show new",
"reload": "Reload",
"up_to_date": "Up-to-date",
"no_more_statuses": "No more statuses",
"no_statuses": "No statuses"