Thibaut Girka 449a0727a7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		2019-08-29 12:07:50 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-29 12:07:50 +02:00
v2	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
web	Fix web push notifications for polls (#10864)	2019-05-28 00:26:08 +02:00
base_controller.rb	Fix ActivityPub and REST API queries setting cookies and preventing caching (#11539)	2019-08-11 22:59:40 +02:00
oembed_controller.rb	Update status embeds (#4742)	2017-08-30 10:23:43 +02:00
proofs_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00