Claire 4aa78027ea Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
   glitch-specific one (redcarpet).
   Ported upstream change.

2021-06-16 11:24:55 +02:00

..

core

Merge branch 'master' into glitch-soc/merge-upstream

2020-12-15 14:27:06 +01:00

flavours

[Glitch] Update emoji codepoint mappings to v13.1

2021-06-03 21:07:35 +02:00

fonts

…

images

Merge branch 'master' into glitch-soc/merge-upstream

2020-05-13 22:11:49 +02:00

locales

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-01 21:00:16 +01:00

mastodon

Merge branch 'main' into glitch-soc/merge-upstream

2021-06-16 11:24:55 +02: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 'main' into glitch-soc/merge-upstream

2021-06-03 20:47:02 +02:00