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.

David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		7 years ago
..
v1	Direct messages column (#4514)	7 years ago
web	Improve web api protect (#6343)	7 years ago
base_controller.rb	Ensure that boolean params in the API are parsed for truthiness (#6575)	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)	8 years ago
salmon_controller.rb	Fix response of signature_verification_failure_reason (#6441)	7 years ago
subscriptions_controller.rb	HTTP signatures (#4146)	8 years ago