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
..
assets	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00
paperclip	…
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-20 16:49:23 +01:00
templates	…
cli.rb	Add `tootctl search deploy` to avoid ugly rake task syntax (#10403)	2019-03-28 02:16:11 +01:00