Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.		2020-12-19 00:55:12 +01:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
flavours	[Glitch] Change RTL detection to rely on unicode-bidi paragraph by paragraph	2020-12-15 16:42:39 +01:00
fonts
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-19 00:55:12 +01:00
packs	Add ability to require invite request text (#15326)	2020-12-14 10:03:09 +01:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-19 00:55:12 +01:00