Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
..
2017-11-18 11:05:00 -08:00
2019-03-03 22:18:23 +01:00
2018-12-22 20:02:09 +01:00