Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
v2	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
web	Sanitize and sandbox toot embeds (#9552)	2018-12-23 02:16:35 +01:00
base_controller.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
oembed_controller.rb	Update status embeds (#4742)	2017-08-30 10:23:43 +02:00
proofs_controller.rb	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
push_controller.rb	Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)	2017-07-14 23:01:20 +02:00
salmon_controller.rb	Fix response of signature_verification_failure_reason (#6441)	2018-02-08 05:00:45 +01:00
subscriptions_controller.rb	HTTP signatures (#4146)	2017-07-14 20:41:49 +02:00