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
..
2019-02-02 12:25:04 +01:00
2019-02-02 12:25:04 +01:00
2018-09-29 19:03:33 +02:00
2019-02-02 19:11:38 +01:00
2018-08-29 21:13:49 +02:00