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-04-08 21:14:08 +09:00
2019-04-03 18:19:10 +09:00
2019-03-29 22:04:55 +09:00
2017-11-20 22:13:37 -08:00
2019-04-08 12:35:37 +09:00
2019-04-05 06:12:08 +09:00
2019-04-03 07:24:39 +09:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2017-12-09 15:35:22 +01:00
2018-01-22 14:20:58 +01:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-30 23:09:02 +02:00