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 78fa15d08f Merge branch 'master' into glitch-soc/master ... Conflicts: - `streaming/index.js`: Upstream entirely refactored it. Ported our changes to upstream's refactor. Hopefuly.		4 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
chewy/strategy	…
devise	…
generators	…
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	5 years ago
mastodon	Merge branch 'master' into glitch-soc/master	4 years ago
paperclip	Fix thumbnail color extraction (#14464)	4 years ago
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
tasks	…
templates	…
cli.rb	Fix help text around `tootctl email_domain_blocks` (#14147)	4 years ago