1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-19 09:06:02 -05:00
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +01:00
..