Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.

2019-04-08 15:57:56 +02:00

6.5 KiB

Raw Blame History

View Raw