You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.		5 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
v2	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
web	Add follow_request notification type (#12198)	5 years ago
base_controller.rb	Fix generic HTTP 500 error on duplicate records (#12563)	5 years ago
oembed_controller.rb	Update status embeds (#4742)	7 years ago
proofs_controller.rb	Fix proofs API being inaccessible in secure mode (#12495)	5 years ago