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 12:25:04 +01:00
2018-04-18 16:50:19 +02:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00