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
..
2019-02-02 19:11:38 +01:00
2018-10-07 23:44:58 +02:00
2017-11-18 00:16:48 +01:00
2018-10-07 23:44:58 +02:00
2017-11-18 00:16:48 +01:00