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 a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.		7 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
web	Add REST API for Web Push Notifications subscriptions (#7445)	7 years ago
base_controller.rb	Disable API access when login is disabled (#7289)	7 years ago
oembed_controller.rb	Update status embeds (#4742)	7 years ago
push_controller.rb	Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)	7 years ago
salmon_controller.rb	Fix response of signature_verification_failure_reason (#6441)	7 years ago
subscriptions_controller.rb	HTTP signatures (#4146)	7 years ago