Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock		2019-07-30 12:22:33 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
v2
web	Fix web push notifications for polls (#10864)	2019-05-28 00:26:08 +02:00
base_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
oembed_controller.rb
proofs_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00