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 19:11:38 +01:00
2018-10-07 23:44:58 +02:00
2017-11-18 00:16:48 +01:00
2018-10-07 23:44:58 +02:00
2017-11-18 00:16:48 +01:00