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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

2021-10-25 20:28:51 +02:00

..

core

[Glitch] Add graphs and retention metrics to admin dashboard (#16829)

2021-10-14 21:45:01 +02:00

flavours

translation glitch's web interface [ja]

2021-10-24 00:05:33 +09: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-10-25 20:28:51 +02:00

packs

[Glitch] Add graphs and retention metrics to admin dashboard (#16829)

2021-10-14 21:45:01 +02: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-10-25 20:28:51 +02:00