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 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		6 years ago
..
v1	Merge branch 'master' into glitch-soc/master	6 years ago
web	Slightly reduce RAM usage (#7301)	7 years ago
base_controller.rb	Disable API access when login is disabled (#7289)	7 years ago
oembed_controller.rb	…
push_controller.rb	…
salmon_controller.rb	Fix response of signature_verification_failure_reason (#6441)	7 years ago
subscriptions_controller.rb	…