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

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

Browse Source 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
This commit is contained in:
Thibaut Girka
2019-06-24 14:47:48 +02:00
parent 38d2882447 66ac1bd063
commit ddd875ad99
87 changed files with 1585 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/pl.yml
View File

@ -35,7 +35,7 @@ pl:
one: wpisu
other: wpisów
status_count_before: Są autorami
tagline: Śledź znajomych i poznawal nowych
tagline: Śledź znajomych i poznawaj nowych
terms: Zasady użytkowania
user_count_after:
few: użytkowników